diff --git a/application/Caya.rdef b/application/Caya.rdef
index 93b8d70..a497cf6 100644
--- a/application/Caya.rdef
+++ b/application/Caya.rdef
@@ -1,6 +1,4 @@
-
 #include "Caya.h"
-#include "CayaResources.h"
 
 resource app_signature CAYA_SIGNATURE;
 
@@ -20,284 +18,3 @@ resource app_flags B_SINGLE_LAUNCH;
 
 resource file_types message;
 
-resource vector_icon {
-	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C3BD2CCE51EDADE7020106023DE0000000000000003D40004A200049A00053BC"
-	$"2CCECBEDADE7020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFBD2CCE"
-	$"48EDADE7020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357E3FCC6CD89"
-	$"B226020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
-	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
-	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
-	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
-	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
-	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
-	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
-	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
-	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
-	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
-	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
-	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
-	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
-	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
-	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
-	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
-	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
-	$"3820B2C015FF01179020040A06030A0C0B100117842004"
-};
-
-/*
- * Status icons
- */
-
-// Online
-resource(kOnlineIcon) #'VICN' array {
-	$"6E63696601020104040050B96455B9D6BEA917932FFF2766210102044030C345"
-	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
-	$"0002408000000000000000408000C60000C60000"
-};
-
-// Away
-resource(kAwayIcon) #'VICN' array {
-	$"6E636966010201040400FFBA0055FFFFFFA9E8B732FFB891270102044030C345"
-	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
-	$"0002408000000000000000408000C60000C60000"
-};
-
-// Busy
-resource(kBusyIcon) #'VICN' array {
-	$"6E636966010201040400E9060655E1CECEA9C43A3AFF752F2F0102044030C345"
-	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
-	$"0002408000000000000000408000C60000C60000"
-};
-
-// Offline
-resource(kOfflineIcon) #'VICN' array {
-	$"6E63696601020104040000337F558B9097A92D3541FF0F12160102044030C345"
-	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
-	$"0002408000000000000000408000C60000C60000"
-};
-
-/*
- * Misc icons
- */
-
-// Tool icon
-resource(kToolIcon) #'VICN' array {
-	$"6E63696602030100000200160239F20638AB65BE3DD63F501B4A4E27488B2600"
-	$"EBFFAD01060EA6996D062C4248304A34484238464C344F5C305E345E2C5E2C5C"
-	$"4F284C46030A0001001A41745D00000000000041745D442E8BCB345F15FF0117"
-	$"8402040A0001001A41745D00000000000041745D442E8BCB345F001501178602"
-	$"040A0101000241745D00000000000041745D442E8BCB345F"
-};
-
-// Search icon
-resource(kSearchIcon) #'VICN' array {
-	$"6E6369660805010200060338D2F73CD163BF82B23B84A94B88504870C900FFEF"
-	$"A5BDFFFCC0FFFFF890020106023E49240000000000003CAAAA4940004A3000FF"
-	$"FFFCC07CF1B706040192020016023A55A6BAC2293F0DA33E958646C2EB47A1D6"
-	$"0001FF9E020106023C00000000000000003C00004A30004A500000DCF4FFFF60"
-	$"94AA02001603360FF5B7B2B23AD6A4392A794ABC0B4AF035FF55C285005005FF"
-	$"0B0606AE0BB40BBF4D33C3AFB75DC173BDEFC607C13EC804CA28BD82C118B920"
-	$"C51BBB40BF07B8083AB6BC0605AE02B57D3EB9B9C3EFB7BB44BBB751BD75C936"
-	$"CA8EC1B1402F0A093B593D5BBFCDC93E455BC516C5F160465B435D4544510A04"
-	$"5A425E3F5A3D574008022D40BE1B3108023042BF00BAD108023344BFB3BC1D08"
-	$"023646C072BD750802264329440204423AC2BF3ABE583A384438BF2438C38B42"
-	$"4EBE584EC2BF4E4C444CC38B4CBF240606BA0A4C51565B585AC91CCA4EC983C9"
-	$"E959584F4E4B4D050A00010A12414992000000000000414992CA3294CA674701"
-	$"178400040A06010A02414992000000000000414992CA3294CA67470A00010912"
-	$"414992000000000000414992CA3294CA674701178400040A0501090241499200"
-	$"0000000000414992CA3294CA67470A070109023D49920000000000003D49923A"
-	$"DA753AC02E"
-};
-
-/*
- *  Deskbar replicant icons
- */
-
-// Connecting Green
-resource(kOnlineReplicant) #'VICN' array {
-	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C376A70251C9FF89020106023DE0000000000000003D40004A200049A0005376"
-	$"A702CBC9FF89020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BF77A703"
-	$"48C9FF89020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A356C9FF89CD77"
-	$"A704020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
-	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
-	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
-	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
-	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
-	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
-	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
-	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
-	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
-	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
-	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
-	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
-	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
-	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
-	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
-	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
-	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
-	$"3820B2C015FF01179020040A06030A0C0B100117842004"
-};
-
-// Caya icon
-
-resource(kCayaIconReplicant) #'VICN' array {
-	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C3BD2CCE51EDADE7020106023DE0000000000000003D40004A200049A00053BC"
-	$"2CCECBEDADE7020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFBD2CCE"
-	$"48EDADE7020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357E3FCC6CD89"
-	$"B226020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
-	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
-	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
-	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
-	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
-	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
-	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
-	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
-	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
-	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
-	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
-	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
-	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
-	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
-	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
-	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
-	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
-	$"3820B2C015FF01179020040A06030A0C0B100117842004"
-};
-
-// Offline
-
-resource(kOfflineReplicant) #'VICN' array {
-	$"6E636966080501040156020116023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C3A551F3020116023DE0000000000000003D40004A200049A00053A5CBF30201"
-	$"16023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFA548F3020116023EC0D03B"
-	$"F7CDBAC4EE3DD7C849909B4875A357F3CDA2020112023EA645399A4BB883763D"
-	$"B26D497A2947E6FF00FFFFFFFF0003647F000D02045040C9A540C29A40405040"
-	$"C29A40C9A55060C29A60C9A560605060C9A560C29A0002492E492E2A1E354F20"
-	$"4A354F0002492E492EC20DB7EABFC2B752C0DBB782BFC2B7520002BFC2B752BF"
-	$"C2B752BA7BB668B6FEBE79B765BA6DB6FEBE790002B6FEBE79B6FEBE79B6ABC1"
-	$"B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5C2C1A8C54CBFB7C660C0E5C5"
-	$"4CBFB7000233403340BF87C25CC5C9C112C52BC293C5C9C1120002C5C9C112C5"
-	$"C9C112C61CC047453AC50ABF02453A0405FE03403C44394238463A4F374D3951"
-	$"354432483140333C3A3C373C3A0404EF2B442B442F503550324C385436573E4D"
-	$"3F553E4D00024728472842252E2B37222E2B04020E2A30283429322736000233"
-	$"3B333B373D4A3E45444A3E120A0101000241CBC63EAFF7BDA3754091DCCA48B8"
-	$"CB509A0A0001073020B2C001179420040A0501073820B2C0001501178E20040A"
-	$"0501073820B2C015FF01179020040A0101082020B2C00A0001013020B2C00117"
-	$"9420040A0201023820B2C0001501178E20040A0201023820B2C015FF01179020"
-	$"040A0301033820B2C0001501178E20040A0301033820B2C015FF01179020040A"
-	$"0401043820B2C0001501178E20040A0401043820B2C015FF01179020040A0101"
-	$"092020B2C00A0001063020B2C001179420040A0501063820B2C0001501178E20"
-	$"040A0501063820B2C015FF01179020040A0501053820B2C015FF01179020040A"
-	$"06030A0C0B100117842004"
-};
-
-// Busy
-
-resource(kBusyReplicant) #'VICN' array {
-	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C3D6111151FFB3B3020106023DE0000000000000003D40004A200049A00053D6"
-	$"1111CBFFB3B3020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFD61111"
-	$"48FFB3B3020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357FFB3B3CDF2"
-	$"3434020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
-	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
-	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
-	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
-	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
-	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
-	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
-	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
-	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
-	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
-	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
-	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
-	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
-	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
-	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
-	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
-	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
-	$"3820B2C015FF01179020040A06030A0C0B100117842004"
-};
-
-// Away
-
-resource(kAwayReplicant) #'VICN' array {
-	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
-	$"C3FF930651FFFCB3020106023DE0000000000000003D40004A200049A00053FF"
-	$"9306CBFFFCB3020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFFF9306"
-	$"48FFFCB3020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357FFFCB3CDFF"
-	$"B006020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
-	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
-	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
-	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
-	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
-	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
-	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
-	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
-	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
-	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
-	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
-	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
-	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
-	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
-	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
-	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
-	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
-	$"3820B2C015FF01179020040A06030A0C0B100117842004"
-};
-
-// Replicant menu exit
-
-resource(kExitMenuReplicant) #'VICN' array {
-	$"6E63696606040165020006023B17A83B6361BEF4563EB24E4B75B044DE8200F3"
-	$"F3F3FFC7CCD1020106033E40000000000000003D000048000049800034FFFFFF"
-	$"82D1D6DCFF8C9298020006023C800000000000000040000049800000000000FF"
-	$"FFFFFF737A800501020006023A3AE43BE90DBF66193DE06C4B72A1462FBE00FF"
-	$"ABABFFD90000040204BE2730C36F30B8E030B49642B496BC94B496C481BE2754"
-	$"B8E054C36F54544254C48154BC940204BE2730C28C30B9C130B62F3FB62FBC0D"
-	$"B62FC2A4BE274EB9C14EC28C4E503F50C2A450BC0D00043936393631372E412C"
-	$"3C30463F47374947454A3B4C404A3B08023C3EC17136070A0002010002404000"
-	$"0000000000003FC71CBDFFFF4471C70A0402010018001501178600040A040201"
-	$"001815FF01178400040A02020100000A030101000A010101023FCCD000000000"
-	$"00003FBBBB40CC7F4022220A05020203100117842004"
-};
-
-// Replicant message received
-
-resource(kReplicantMessageReceived) #'VICN' array {
-	$"6E636966050500020106033D835C3C19B2BA8B0B3C20794769624A510E00FFCE"
-	$"CEB4FF0404FFC10505020106023D835C3C19B2BA8B0B3C20794769624A510E00"
-	$"FF0404FFC10505020106033D429E3C5148BB5ADA3C5C1B4A23AA46EC1800AAE4"
-	$"F3B40392B6FF03627A05FF0502093F404644383C273F2E3A244122482245224D"
-	$"2755245126572256245725582A5828592C5A315C2F5B345D3C5E385E425E4957"
-	$"475C4D4E02043F4044433D3FBC95BE953B3D333D3D493844424E4A5148534A4A"
-	$"04032E264DB84FC80CB673C6C93258385902085645C8FEC3AFCA30C0E55E3A5E"
-	$"405EBA4D5227592B4A2237263E21BA16B6DF33353130363E4A4641444D475346"
-	$"C657C27B554BCB01C635584F5A4F04032E36353F3DBD0FBD2D44404C42090A00"
-	$"01001001178400040A010100000A020101000A0401021001178210040A040102"
-	$"123FFD6238491FB8085D3F8C5843A1A3BE897201178210040A00010310011784"
-	$"00040A030103000A0401041001178210040A040104123FC0CBB65EEB3639DA3F"
-	$"FF4C40FECDC3C0A80117821004"
-};
-
-// Person icon
-
-resource(kPersonIcon) #'VICN' array {
-	$"6E636966080500020006023CADF43D104EBF02CA3EA2224AF02046648D00FFDB"
-	$"97FFFCAF29020006023A6496BA3F153EBCDD3EEA9146596AC09D5100FFF7EAFE"
-	$"FDD17B020006023AB3673751B2BC59783FD2D74AE3F146F85900C85805FFF063"
-	$"06020106033AC71C0000000000003AB6DB48D40045300000F2F2F2FFBCA184AB"
-	$"7D7A7A04016903A3290402000602388A2800000000000040000049E000000000"
-	$"00C85804FFDC952F090A0D2E302E4330453059345B365B365C3A5E4058404742"
-	$"454232352C0A0B2E302E4230453059345B365B365C3A5E3A4A3C4A3C360A062E"
-	$"303C3642323630BD5BB893352C0A083C4A3A4A3A5E40584047424542323C3602"
-	$"0438223B22352232283225322B382E352E3B2E3E283E2B3E250607FE1B3A5F44"
-	$"5F3F5F495FC738CAF4C569CAE4CB5ACB1BCA0FC8AACC99C976C888C82F4E5552"
-	$"574C544254580A043A4A3A5040473C4A0A03363042323A2E0A04345B365B364A"
-	$"34490A0A050105000A0001001001178400040A010101000A020102000A030103"
-	$"000A060106000A070107000A0001041001178400040A040104000A0301080815"
-	$"FF"
-};
-
diff --git a/application/Makefile b/application/Makefile
index 2024ee9..b250f2f 100644
--- a/application/Makefile
+++ b/application/Makefile
@@ -85,7 +85,22 @@ SRCS = \
 
 #	Specify the resource definition files to use. Full or relative paths can be
 #	used.
-RDEFS = Caya.rdef
+RDEFS = Caya.rdef \
+	data/icons/Caya.rdef \
+	data/icons/status/Away.rdef \
+	data/icons/status/Busy.rdef \
+	data/icons/status/Offline.rdef \
+	data/icons/status/Online.rdef \
+	data/icons/replicant/Away.rdef \
+	data/icons/replicant/Busy.rdef \
+	data/icons/replicant/CayaIcon.rdef \
+	data/icons/replicant/ExitMenu.rdef \
+	data/icons/replicant/MessageReceived.rdef \
+	data/icons/replicant/Offline.rdef \
+	data/icons/replicant/Online.rdef \
+	data/icons/misc/Person.rdef \
+	data/icons/misc/Search.rdef \
+	data/icons/misc/Tool.rdef
 
 #	Specify the resource files to use. Full or relative paths can be used.
 #	Both RDEFS and RSRCS can be utilized in the same Makefile.
diff --git a/data/icons/Caya.rdef b/data/icons/Caya.rdef
new file mode 100644
index 0000000..e15d348
--- /dev/null
+++ b/data/icons/Caya.rdef
@@ -0,0 +1,25 @@
+
+resource vector_icon array {
+	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"51EDADE7C3BD2CCE020106023DE0000000000000003D40004A200049A00053BC"
+	$"2CCECBEDADE7020106023F5C743B37D1BAB2F23ED1AC471CEC4937F848EDADE7"
+	$"BFBD2CCE020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357E3FCC6CD89"
+	$"B226020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
+	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
+	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
+	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
+	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
+	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
+	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
+	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
+	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
+	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
+	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
+	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
+	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
+	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
+	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
+	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
+	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
+	$"3820B2C015FF01179020040A06030A0C0B100117842004"
+};
diff --git a/data/icons/misc/Person b/data/icons/misc/Person
new file mode 100644
index 0000000..1502912
Binary files /dev/null and b/data/icons/misc/Person differ
diff --git a/data/icons/misc/Person.rdef b/data/icons/misc/Person.rdef
new file mode 100644
index 0000000..1d87a05
--- /dev/null
+++ b/data/icons/misc/Person.rdef
@@ -0,0 +1,19 @@
+#include "application/CayaResources.h"
+
+resource(kPersonIcon) #'VICN' array {
+	$"6E636966080500020006023CADF43D104EBF02CA3EA2224AF02046648D00FFDB"
+	$"97FFFCAF29020006023A6496BA3F153EBCDD3EEA9146596AC09D5100FFF7EAFE"
+	$"FDD17B020006023AB3673751B2BC59783FD2D74AE3F146F85900C85805FFF063"
+	$"06020106033AC71C0000000000003AB6DB48D40045300000F2F2F2FFBCA184AB"
+	$"7D7A7A04016903A3290402000602388A2800000000000040000049E000000000"
+	$"00C85804FFDC952F090A0D2E302E4330453059345B365B365C3A5E4058404742"
+	$"454232352C0A0B2E302E4230453059345B365B365C3A5E3A4A3C4A3C360A062E"
+	$"303C3642323630BD5BB893352C0A083C4A3A4A3A5E40584047424542323C3602"
+	$"0438223B22352232283225322B382E352E3B2E3E283E2B3E250607FE1B3A5F44"
+	$"5F3F5F495FC738CAF4C569CAE4CB5ACB1BCA0FC8AACC99C976C888C82F4E5552"
+	$"574C544254580A043A4A3A5040473C4A0A03363042323A2E0A04345B365B364A"
+	$"34490A0A050105000A0001001001178400040A010101000A020102000A030103"
+	$"000A060106000A070107000A0001041001178400040A040104000A0301080815"
+	$"FF"
+};
+
diff --git a/data/icons/misc/Search.rdef b/data/icons/misc/Search.rdef
new file mode 100644
index 0000000..50969a1
--- /dev/null
+++ b/data/icons/misc/Search.rdef
@@ -0,0 +1,20 @@
+#include "application/CayaResources.h"
+
+resource(kSearchIcon) #'VICN' array {
+	$"6E6369660805010200060338D2F73CD163BF82B23B84A94B88504870C900FFEF"
+	$"A5BDFFFCC0FFFFF890020106023E49240000000000003CAAAA4940004A30007C"
+	$"F1B706FFFFFCC0040192020016023A55A6BAC2293F0DA33E958646C2EB47A1D6"
+	$"0001FF9E020106023C00000000000000003C00004A30004A500000DCF4FFFF60"
+	$"94AA02001603360FF5B7B2B23AD6A4392A794ABC0B4AF0350050C285FF5505FF"
+	$"0B0606AE0BB40BBF4D33C3AEB75CC172BDEFC606C13EC804CA27BD82C117B920"
+	$"C51BBB40BF06B8073AB6BC0605AE02B57D3EB9B9C3EFB7BB44BBB751BD75C936"
+	$"CA8DC1B0402F0A093B593D5BBFCDC93D455BC516C5F060465B435D4544510A04"
+	$"5A425E3F5A3D574008022D40BE1B3108023042BF00BAD108023344BFB3BC1D08"
+	$"023646C072BD750802264329440204423AC2BE3ABE583A384438BF2438C38A42"
+	$"4EBE584EC2BE4E4C444CC38A4CBF240606BA0A4C51565B585AC91CCA4EC983C9"
+	$"E959584F4E4B4D050A00010A12414992000000000000414992CA3294CA674701"
+	$"178400040A06010A02414992000000000000414992CA3294CA67470A00010912"
+	$"414992000000000000414992CA3294CA674701178400040A0501090241499200"
+	$"0000000000414992CA3294CA67470A070109023D49920000000000003D49923A"
+	$"DA753AC02E"
+};
diff --git a/data/icons/misc/Tool b/data/icons/misc/Tool
index 0fd3c4b..507bbfd 100644
Binary files a/data/icons/misc/Tool and b/data/icons/misc/Tool differ
diff --git a/data/icons/misc/Tool.rdef b/data/icons/misc/Tool.rdef
new file mode 100644
index 0000000..09586a7
--- /dev/null
+++ b/data/icons/misc/Tool.rdef
@@ -0,0 +1,9 @@
+#include "application/CayaResources.h"
+
+resource(kToolIcon) #'VICN' array {
+	$"6E63696602030100000200160239F20638AB65BE3DD63F501B4A4E27488B2600"
+	$"EBFFAD01060EA6996D062C4248304A34484238464C344F5C305E345E2C5E2C5C"
+	$"4F284C46030A0001001A41745D00000000000041745D442E8BCB345F15FF0117"
+	$"8402040A0001001A41745D00000000000041745D442E8BCB345F001501178602"
+	$"040A0101000241745D00000000000041745D442E8BCB345F"
+};
diff --git a/data/icons/protocols/Facebook.rdef b/data/icons/protocols/Facebook.rdef
new file mode 100644
index 0000000..c606ec0
--- /dev/null
+++ b/data/icons/protocols/Facebook.rdef
@@ -0,0 +1,9 @@
+
+resource(1, "facebook") #'VICN' array {
+	$"6E6369660202000602000000C000004000000000009220244C000067003C7FFF"
+	$"1A5EA805FF0206111B1111BD01C0A72B4828BF72B8033FBBBA3C39463F5C4A46"
+	$"523C4ABC4D4ABB7A4ABC4DC3D234C59634C51C34C659BB0E54352C0208242824"
+	$"2624BA4724C94924C528245AB6245C265CBA355CC94B5CC5285C5A5C5CC9565C"
+	$"5A5CC5485CB64A5CBA7B5C26C951245A24C55D242824BA53242624020A000101"
+	$"000A01010000"
+};
diff --git a/data/icons/protocols/GoogleTalk.rdef b/data/icons/protocols/GoogleTalk.rdef
new file mode 100644
index 0000000..8b19457
--- /dev/null
+++ b/data/icons/protocols/GoogleTalk.rdef
@@ -0,0 +1,22 @@
+
+resource(2, "gtalk") #'VICN' array {
+	$"6E636966080501040046020106023E40000000000000003D4000494000470000"
+	$"7EFFFFFFFFE5E1DA02000602000000BBC0004000000000009220244AF0000000"
+	$"33CCFC3366FF02000602000000BA000040000000000092202448800000336699"
+	$"FF6699CC02000602000000B9000040000000000092202448E00000CC0000FFFF"
+	$"000002000602000000BA000040000000000092202448800000FF9900FFFBFF00"
+	$"02000602000000BA000040000000000092202448800000006600FF00CC000A02"
+	$"06C22622C7562239222E342E2B2E3D4146364441483C50404C3C504A444A4E55"
+	$"44CBB634CBB83E5E2A0206C22622C7562239222E342E2B2E3D4146364441483C"
+	$"50404C3C504C464A505744CBB634CBB83E5E2A02024C265928532A583B59335D"
+	$"350610CAFFFEAF375335543B3B5A3B5A395D325D355D2C5D274F275627483241"
+	$"2C413541BDA7C2A83942BDA7C2A8394A3F463F463C40324036402A40234F2346"
+	$"2358325E2A5E395EBF5C5A3F5CBF5C5A3F544053080234313C310404FE372C37"
+	$"393739373A393B383B3A3B3B393B3A3B390406FE0B4536403640363F363E383E"
+	$"373E383E393E393E3A403B3F3B413B453A0405FE03453C453445344533433244"
+	$"324332403240323F323E343E333E3408024D2C4D3C0803553C4F3655300D0A00"
+	$"01001001178400040A020101000A010102000A0101032021210A010204053021"
+	$"2101178200040A0102070630212101178200040A010108301D2101178200040A"
+	$"0102090830212101178200040A030103000A040204051001178200040A050207"
+	$"061001178200040A060108301C2001178200040A07020908100117820004"
+};
diff --git a/data/icons/protocols/Jabber.rdef b/data/icons/protocols/Jabber.rdef
new file mode 100644
index 0000000..cea9ef7
--- /dev/null
+++ b/data/icons/protocols/Jabber.rdef
@@ -0,0 +1,44 @@
+
+resource vector_icon {
+	$"6E63696604020006023D8E720000000000003D8E7249E39E4BD9AA00FFFFFFFF"
+	$"FBEE01050005FF02000606363A4ABA2B773A2B77363A4A4B0C4F48628900FBFD"
+	$"BA0CFBFDC147FDFEDC83FEFFEFC0FFFFFBFFFFFFFF120204C93ABFEBCD6DBA93"
+	$"BF9CCC27BF56CC51C75ACC5BB7A9CC46B589BFBABF9ECDEFB19CBA31BF48B40F"
+	$"B5BCB40FC86EB40F04032EBA80CE61BF05CF67BC8CCF51C17ECF7DC3E2CEB804"
+	$"032EBACCD10EBEF36EBCADD1FFC139D22AC36AD16504032EBD92CC52BC8CC3A7"
+	$"BE82C6D5BA96C07ABA75C04504032EC039CC3FC13FC394BF49C6C1C335C06649"
+	$"C0310204BCD3BFA8BC7ABFA8BD2CBFA8BD71C047BD71BFEEBD71C09FBCD3C0E5"
+	$"BD2CC0E5BC7AC0E5BC35C047BC35C09FBC35BFEE0204BD8CBFA8BD34BFA8BDE5"
+	$"BFA8BE2BC047BE2BBFEEBE2BC09FBD8CC0E5BDE5C0E5BD34C0E5BCEEC047BCEE"
+	$"C09FBCEEBFEE0204BE46BFA8BDEDBFA8BE9FBFA8BEE4C047BEE4BFEEBEE4C09F"
+	$"BE46C0E5BE9FC0E5BDEDC0E5BDA8C047BDA8C09FBDA8BFEE0204BEEABFA8BE91"
+	$"BFA8BF42BFA8BF88C047BF88BFEEBF88C09FBEEAC0E5BF42C0E5BE91C0E5BE4B"
+	$"C047BE4BC09FBE4BBFEE0204BF98BFA8BF40BFA8BFF1BFA8C037C047C037BFEE"
+	$"C037C09FBF98C0E5BFF1C0E5BF40C0E5BEFAC047BEFAC09FBEFABFEE0204C010"
+	$"BFA8BFB8BFA8C069BFA8C0AFC047C0AFBFEEC0AFC09FC010C0E5C069C0E5BFB8"
+	$"C0E5BF72C047BF72C09FBF72BFEE0204C10CBFA8C0B3BFA8C164BFA8C1AAC047"
+	$"C1AABFEEC1AAC09FC10CC0E5C164C0E5C0B3C0E5C06DC047C06DC09FC06DBFEE"
+	$"0204C19ABFA8C141BFA8C1F2BFA8C238C047C238BFEEC238C09FC19AC0E5C1F2"
+	$"C0E5C141C0E5C0FBC047C0FBC09FC0FBBFEE04032EBC3FBFE7BB65C047BBC8C0"
+	$"3CBB03C051BAA1C03104032EC243C007C28FC027C202C007C31DC047C375C047"
+	$"04032EC243C007C28FC027C202C007C31DC047C375C0470204C86DBC5FC94CBA"
+	$"AFC78EBE0FC165BCC5C469BE3DBE62BB4DBD85B70EBCA6B8BEBE64B55DC48DB6"
+	$"A8C18AB52FC790B8200204BF34D2E8BE2CD2E8C03CD2E8C10CD3DCC10CD353C1"
+	$"0CD464BF34D4CFC03CD4CFBE2CD4CF3AD3DC3AD4643AD353130A000100023EEC"
+	$"A00000000000003EECA04640053FFFFB0A010100123EECA00000000000003EEC"
+	$"A04640053FFFFB01178300040A010101123EECA00000000000003EECA0464005"
+	$"3FFFFB01178222040A010102123EECA00000000000003EECA04640053FFFFB01"
+	$"178222040A010103123EECA00000000000003EECA04640053FFFFB0117812204"
+	$"0A010104123EECA00000000000003EECA04640053FFFFB01178122040A010105"
+	$"123EECA00000000000003EECA04640053FFFFB01178022040A010106123EECA0"
+	$"0000000000003EECA04640053FFFFB01178022040A010107123EECA000000000"
+	$"00003EECA04640053FFFFB01178022040A010108123EECA00000000000003EEC"
+	$"A04640053FFFFB01178022040A010109123EECA00000000000003EECA0464005"
+	$"3FFFFB01178022040A01010A123EECA00000000000003EECA04640053FFFFB01"
+	$"178022040A01010B123EECA00000000000003EECA04640053FFFFB0117802204"
+	$"0A01010C123EECA00000000000003EECA04640053FFFFB01178022040A01010D"
+	$"123EECA00000000000003EECA04640053FFFFB01178022040A02010E023EECA0"
+	$"0000000000003EECA04640053FFFFB0A01010F123EECA00000000000003EECA0"
+	$"4640053FFFFB01178000040A030110023EECA00000000000003EECA04640053F"
+	$"FFFB0A010111023EECA00000000000003EECA04640053FFFFB"
+};
diff --git a/data/icons/replicant/Away b/data/icons/replicant/Away
new file mode 100644
index 0000000..17171ad
Binary files /dev/null and b/data/icons/replicant/Away differ
diff --git a/data/icons/replicant/Away.rdef b/data/icons/replicant/Away.rdef
new file mode 100644
index 0000000..900b113
--- /dev/null
+++ b/data/icons/replicant/Away.rdef
@@ -0,0 +1,27 @@
+#include "application/CayaResources.h"
+
+resource(kAwayReplicant) #'VICN' array {
+	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"C3FF930651FFFCB3020106023DE0000000000000003D40004A200049A00053FF"
+	$"9306CBFFFCB3020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFFF9306"
+	$"48FFFCB3020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357FFFCB3CDFF"
+	$"B006020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
+	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
+	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
+	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
+	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
+	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
+	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
+	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
+	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
+	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
+	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
+	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
+	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
+	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
+	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
+	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
+	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
+	$"3820B2C015FF01179020040A06030A0C0B100117842004"
+};
+
diff --git a/data/icons/replicant/Busy b/data/icons/replicant/Busy
new file mode 100644
index 0000000..a13816c
Binary files /dev/null and b/data/icons/replicant/Busy differ
diff --git a/data/icons/replicant/Busy.rdef b/data/icons/replicant/Busy.rdef
new file mode 100644
index 0000000..0341a57
--- /dev/null
+++ b/data/icons/replicant/Busy.rdef
@@ -0,0 +1,27 @@
+#include "application/CayaResources.h"
+
+resource(kBusyReplicant) #'VICN' array {
+	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"C3D6111151FFB3B3020106023DE0000000000000003D40004A200049A00053D6"
+	$"1111CBFFB3B3020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFD61111"
+	$"48FFB3B3020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357FFB3B3CDF2"
+	$"3434020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
+	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
+	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
+	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
+	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
+	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
+	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
+	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
+	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
+	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
+	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
+	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
+	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
+	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
+	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
+	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
+	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
+	$"3820B2C015FF01179020040A06030A0C0B100117842004"
+};
+
diff --git a/data/icons/replicant/CayaIcon b/data/icons/replicant/CayaIcon
new file mode 100644
index 0000000..66b571a
Binary files /dev/null and b/data/icons/replicant/CayaIcon differ
diff --git a/data/icons/replicant/CayaIcon.rdef b/data/icons/replicant/CayaIcon.rdef
new file mode 100644
index 0000000..2aa15f1
--- /dev/null
+++ b/data/icons/replicant/CayaIcon.rdef
@@ -0,0 +1,27 @@
+#include "application/CayaResources.h"
+
+resource(kCayaIconReplicant) #'VICN' array {
+	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"C3BD2CCE51EDADE7020106023DE0000000000000003D40004A200049A00053BC"
+	$"2CCECBEDADE7020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFBD2CCE"
+	$"48EDADE7020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A357E3FCC6CD89"
+	$"B226020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
+	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
+	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
+	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
+	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
+	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
+	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
+	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
+	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
+	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
+	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
+	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
+	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
+	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
+	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
+	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
+	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
+	$"3820B2C015FF01179020040A06030A0C0B100117842004"
+};
+
diff --git a/data/icons/replicant/ExitMenu b/data/icons/replicant/ExitMenu
new file mode 100644
index 0000000..bff6ac1
Binary files /dev/null and b/data/icons/replicant/ExitMenu differ
diff --git a/data/icons/replicant/ExitMenu.rdef b/data/icons/replicant/ExitMenu.rdef
new file mode 100644
index 0000000..1412f8c
--- /dev/null
+++ b/data/icons/replicant/ExitMenu.rdef
@@ -0,0 +1,16 @@
+#include "application/CayaResources.h"
+
+resource(kExitMenuReplicant) #'VICN' array {
+	$"6E63696606040165020006023B17A83B6361BEF4563EB24E4B75B044DE8200F3"
+	$"F3F3FFC7CCD1020106033E40000000000000003D000048000049800034FFFFFF"
+	$"82D1D6DCFF8C9298020006023C800000000000000040000049800000000000FF"
+	$"FFFFFF737A800501020006023A3AE43BE90DBF66193DE06C4B72A1462FBE00FF"
+	$"ABABFFD90000040204BE2730C36F30B8E030B49642B496BC94B496C481BE2754"
+	$"B8E054C36F54544254C48154BC940204BE2730C28C30B9C130B62F3FB62FBC0D"
+	$"B62FC2A4BE274EB9C14EC28C4E503F50C2A450BC0D00043936393631372E412C"
+	$"3C30463F47374947454A3B4C404A3B08023C3EC17136070A0002010002404000"
+	$"0000000000003FC71CBDFFFF4471C70A0402010018001501178600040A040201"
+	$"001815FF01178400040A02020100000A030101000A010101023FCCD000000000"
+	$"00003FBBBB40CC7F4022220A05020203100117842004"
+};
+
diff --git a/data/icons/replicant/MessageReceived b/data/icons/replicant/MessageReceived
new file mode 100644
index 0000000..73e5e50
Binary files /dev/null and b/data/icons/replicant/MessageReceived differ
diff --git a/data/icons/replicant/MessageReceived.rdef b/data/icons/replicant/MessageReceived.rdef
new file mode 100644
index 0000000..6528fed
--- /dev/null
+++ b/data/icons/replicant/MessageReceived.rdef
@@ -0,0 +1,18 @@
+#include "application/CayaResources.h"
+
+resource(kReplicantMessageReceived) #'VICN' array {
+	$"6E636966050500020106033D835C3C19B2BA8B0B3C20794769624A510E00FFCE"
+	$"CEB4FF0404FFC10505020106023D835C3C19B2BA8B0B3C20794769624A510E00"
+	$"FF0404FFC10505020106033D429E3C5148BB5ADA3C5C1B4A23AA46EC1800AAE4"
+	$"F3B40392B6FF03627A05FF0502093F404644383C273F2E3A244122482245224D"
+	$"2755245126572256245725582A5828592C5A315C2F5B345D3C5E385E425E4957"
+	$"475C4D4E02043F4044433D3FBC95BE953B3D333D3D493844424E4A5148534A4A"
+	$"04032E264DB84FC80CB673C6C93258385902085645C8FEC3AFCA30C0E55E3A5E"
+	$"405EBA4D5227592B4A2237263E21BA16B6DF33353130363E4A4641444D475346"
+	$"C657C27B554BCB01C635584F5A4F04032E36353F3DBD0FBD2D44404C42090A00"
+	$"01001001178400040A010100000A020101000A0401021001178210040A040102"
+	$"123FFD6238491FB8085D3F8C5843A1A3BE897201178210040A00010310011784"
+	$"00040A030103000A0401041001178210040A040104123FC0CBB65EEB3639DA3F"
+	$"FF4C40FECDC3C0A80117821004"
+};
+
diff --git a/data/icons/replicant/Offline b/data/icons/replicant/Offline
new file mode 100644
index 0000000..442d0e4
Binary files /dev/null and b/data/icons/replicant/Offline differ
diff --git a/data/icons/replicant/Offline.rdef b/data/icons/replicant/Offline.rdef
new file mode 100644
index 0000000..74da2e4
--- /dev/null
+++ b/data/icons/replicant/Offline.rdef
@@ -0,0 +1,27 @@
+#include "application/CayaResources.h"
+
+resource(kOfflineReplicant) #'VICN' array {
+	$"6E636966080501040156020116023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"C3A551F3020116023DE0000000000000003D40004A200049A00053A5CBF30201"
+	$"16023F5C743B37D1BAB2F23ED1AC471CEC4937F8BFA548F3020116023EC0D03B"
+	$"F7CDBAC4EE3DD7C849909B4875A357F3CDA2020112023EA645399A4BB883763D"
+	$"B26D497A2947E6FF00FFFFFFFF0003647F000D02045040C9A540C29A40405040"
+	$"C29A40C9A55060C29A60C9A560605060C9A560C29A0002492E492E2A1E354F20"
+	$"4A354F0002492E492EC20DB7EABFC2B752C0DBB782BFC2B7520002BFC2B752BF"
+	$"C2B752BA7BB668B6FEBE79B765BA6DB6FEBE790002B6FEBE79B6FEBE79B6ABC1"
+	$"B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5C2C1A8C54CBFB7C660C0E5C5"
+	$"4CBFB7000233403340BF87C25CC5C9C112C52BC293C5C9C1120002C5C9C112C5"
+	$"C9C112C61CC047453AC50ABF02453A0405FE03403C44394238463A4F374D3951"
+	$"354432483140333C3A3C373C3A0404EF2B442B442F503550324C385436573E4D"
+	$"3F553E4D00024728472842252E2B37222E2B04020E2A30283429322736000233"
+	$"3B333B373D4A3E45444A3E120A0101000241CBC63EAFF7BDA3754091DCCA48B8"
+	$"CB509A0A0001073020B2C001179420040A0501073820B2C0001501178E20040A"
+	$"0501073820B2C015FF01179020040A0101082020B2C00A0001013020B2C00117"
+	$"9420040A0201023820B2C0001501178E20040A0201023820B2C015FF01179020"
+	$"040A0301033820B2C0001501178E20040A0301033820B2C015FF01179020040A"
+	$"0401043820B2C0001501178E20040A0401043820B2C015FF01179020040A0101"
+	$"092020B2C00A0001063020B2C001179420040A0501063820B2C0001501178E20"
+	$"040A0501063820B2C015FF01179020040A0501053820B2C015FF01179020040A"
+	$"06030A0C0B100117842004"
+};
+
diff --git a/data/icons/replicant/Online b/data/icons/replicant/Online
new file mode 100644
index 0000000..643ac5e
Binary files /dev/null and b/data/icons/replicant/Online differ
diff --git a/data/icons/replicant/Online.rdef b/data/icons/replicant/Online.rdef
new file mode 100644
index 0000000..8f31cdf
--- /dev/null
+++ b/data/icons/replicant/Online.rdef
@@ -0,0 +1,27 @@
+#include "application/CayaResources.h"
+
+resource(kOnlineReplicant) #'VICN' array {
+	$"6E636966070501040156020106023DB0753A5ED7B9F9EE3D18204A5B813F873F"
+	$"C376A70251C9FF89020106023DE0000000000000003D40004A200049A0005376"
+	$"A702CBC9FF89020106023F5C743B37D1BAB2F23ED1AC471CEC4937F8BF77A703"
+	$"48C9FF89020106023EC0D03BF7CDBAC4EE3DD7C849909B4875A356C9FF89CD77"
+	$"A704020112023EA645399A4BB883763DB26D497A2947E6FF00FFFFFFFF000D02"
+	$"045040C9A540C29A40405040C29A40C9A55060C29A60C9A560605060C9A560C2"
+	$"9A0002492E492E2A1E354F204A354F0002492E492EC20DB7EABFC2B752C0DBB7"
+	$"82BFC2B7520002BFC2B752BFC2B752BA7BB668B6FEBE79B765BA6DB6FEBE7900"
+	$"02B6FEBE79B6FEBE79B6ABC1B2354FB80BC4EF354F0002C43BC1E9C43BC1E9C5"
+	$"C2C1A8C54CBFB7C660C0E5C54CBFB7000233403340BF87C25CC5C9C112C52BC2"
+	$"93C5C9C1120002C5C9C112C5C9C112C61CC047453AC50ABF02453A0405FE0340"
+	$"3C44394238463A4F374D3951354432483140333C3A3C373C3A0404EF2B442B44"
+	$"2F503550324C385436573E4D3F553E4D00024728472842252E2B37222E2B0402"
+	$"0E2A302834293227360002333B333B373D4A3E45444A3E120A0101000241CBC6"
+	$"3EAFF7BDA3754091DCCA48B8CB509A0A0001073020B2C001179420040A050107"
+	$"3820B2C0001501178E20040A0501073820B2C015FF01179020040A0101082020"
+	$"B2C00A0001013020B2C001179420040A0201023820B2C0001501178E20040A02"
+	$"01023820B2C015FF01179020040A0301033820B2C0001501178E20040A030103"
+	$"3820B2C015FF01179020040A0401043820B2C0001501178E20040A0401043820"
+	$"B2C015FF01179020040A0101092020B2C00A0001063020B2C001179420040A05"
+	$"01063820B2C0001501178E20040A0501063820B2C015FF01179020040A050105"
+	$"3820B2C015FF01179020040A06030A0C0B100117842004"
+};
+
diff --git a/data/icons/status/Away.rdef b/data/icons/status/Away.rdef
new file mode 100644
index 0000000..b1c4e9f
--- /dev/null
+++ b/data/icons/status/Away.rdef
@@ -0,0 +1,7 @@
+#include "application/CayaResources.h"
+
+resource(kAwayIcon) #'VICN' array {
+	$"6E636966010201040400FFBA0055FFFFFFA9E8B732FFB891270102044030C345"
+	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
+	$"0002408000000000000000408000C60000C60000"
+};
diff --git a/data/icons/status/Busy.rdef b/data/icons/status/Busy.rdef
new file mode 100644
index 0000000..11f61a5
--- /dev/null
+++ b/data/icons/status/Busy.rdef
@@ -0,0 +1,7 @@
+#include "application/CayaResources.h"
+
+resource(kBusyIcon) #'VICN' array {
+	$"6E636966010201040400E9060655E1CECEA9C43A3AFF752F2F0102044030C345"
+	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
+	$"0002408000000000000000408000C60000C60000"
+};
diff --git a/data/icons/status/Offline.rdef b/data/icons/status/Offline.rdef
new file mode 100644
index 0000000..2a3b2eb
--- /dev/null
+++ b/data/icons/status/Offline.rdef
@@ -0,0 +1,7 @@
+#include "application/CayaResources.h"
+
+resource(kOfflineIcon) #'VICN' array {
+	$"6E63696601020104040000337F558B9097A92D3541FF0F12160102044030C345"
+	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
+	$"0002408000000000000000408000C60000C60000"
+};
diff --git a/data/icons/status/Online.rdef b/data/icons/status/Online.rdef
new file mode 100644
index 0000000..90e02d6
--- /dev/null
+++ b/data/icons/status/Online.rdef
@@ -0,0 +1,7 @@
+#include "application/CayaResources.h"
+
+resource(kOnlineIcon) #'VICN' array {
+	$"6E63696601020104040050B96455B9D6BEA917932FFF2766210102044030C345"
+	$"30BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A010A0001"
+	$"0002408000000000000000408000C60000C60000"
+};
diff --git a/protocols/xmpp/Makefile b/protocols/xmpp/Makefile
index 99b8983..0a69bee 100644
--- a/protocols/xmpp/Makefile
+++ b/protocols/xmpp/Makefile
@@ -42,7 +42,10 @@ SRCS = \
 #	Specify the resource definition files to use. Full or relative paths can be
 #	used.
 RDEFS = \
-	protocols/xmpp/jabber.rdef
+	protocols/xmpp/jabber.rdef \
+	data/icons/protocols/Jabber.rdef \
+	data/icons/protocols/GoogleTalk.rdef \
+	data/icons/protocols/Facebook.rdef
 
 #	Specify the resource files to use. Full or relative paths can be used.
 #	Both RDEFS and RSRCS can be utilized in the same Makefile.
diff --git a/protocols/xmpp/jabber.rdef b/protocols/xmpp/jabber.rdef
index fea4753..425f598 100644
--- a/protocols/xmpp/jabber.rdef
+++ b/protocols/xmpp/jabber.rdef
@@ -11,78 +11,3 @@ resource app_version {
 	long_info = "©2010 Pier Luigi Fiorini"
 };
 
-resource vector_icon {
-	$"6E63696604020006023D8E720000000000003D8E7249E39E4BD9AA00FFFFFFFF"
-	$"FBEE01050005FF02000606363A4ABA2B773A2B77363A4A4B0C4F48628900FBFD"
-	$"BA0CFBFDC147FDFEDC83FEFFEFC0FFFFFBFFFFFFFF120204C93ABFEBCD6DBA93"
-	$"BF9CCC27BF56CC51C75ACC5BB7A9CC46B589BFBABF9ECDEFB19CBA31BF48B40F"
-	$"B5BCB40FC86EB40F04032EBA80CE61BF05CF67BC8CCF51C17ECF7DC3E2CEB804"
-	$"032EBACCD10EBEF36EBCADD1FFC139D22AC36AD16504032EBD92CC52BC8CC3A7"
-	$"BE82C6D5BA96C07ABA75C04504032EC039CC3FC13FC394BF49C6C1C335C06649"
-	$"C0310204BCD3BFA8BC7ABFA8BD2CBFA8BD71C047BD71BFEEBD71C09FBCD3C0E5"
-	$"BD2CC0E5BC7AC0E5BC35C047BC35C09FBC35BFEE0204BD8CBFA8BD34BFA8BDE5"
-	$"BFA8BE2BC047BE2BBFEEBE2BC09FBD8CC0E5BDE5C0E5BD34C0E5BCEEC047BCEE"
-	$"C09FBCEEBFEE0204BE46BFA8BDEDBFA8BE9FBFA8BEE4C047BEE4BFEEBEE4C09F"
-	$"BE46C0E5BE9FC0E5BDEDC0E5BDA8C047BDA8C09FBDA8BFEE0204BEEABFA8BE91"
-	$"BFA8BF42BFA8BF88C047BF88BFEEBF88C09FBEEAC0E5BF42C0E5BE91C0E5BE4B"
-	$"C047BE4BC09FBE4BBFEE0204BF98BFA8BF40BFA8BFF1BFA8C037C047C037BFEE"
-	$"C037C09FBF98C0E5BFF1C0E5BF40C0E5BEFAC047BEFAC09FBEFABFEE0204C010"
-	$"BFA8BFB8BFA8C069BFA8C0AFC047C0AFBFEEC0AFC09FC010C0E5C069C0E5BFB8"
-	$"C0E5BF72C047BF72C09FBF72BFEE0204C10CBFA8C0B3BFA8C164BFA8C1AAC047"
-	$"C1AABFEEC1AAC09FC10CC0E5C164C0E5C0B3C0E5C06DC047C06DC09FC06DBFEE"
-	$"0204C19ABFA8C141BFA8C1F2BFA8C238C047C238BFEEC238C09FC19AC0E5C1F2"
-	$"C0E5C141C0E5C0FBC047C0FBC09FC0FBBFEE04032EBC3FBFE7BB65C047BBC8C0"
-	$"3CBB03C051BAA1C03104032EC243C007C28FC027C202C007C31DC047C375C047"
-	$"04032EC243C007C28FC027C202C007C31DC047C375C0470204C86DBC5FC94CBA"
-	$"AFC78EBE0FC165BCC5C469BE3DBE62BB4DBD85B70EBCA6B8BEBE64B55DC48DB6"
-	$"A8C18AB52FC790B8200204BF34D2E8BE2CD2E8C03CD2E8C10CD3DCC10CD353C1"
-	$"0CD464BF34D4CFC03CD4CFBE2CD4CF3AD3DC3AD4643AD353130A000100023EEC"
-	$"A00000000000003EECA04640053FFFFB0A010100123EECA00000000000003EEC"
-	$"A04640053FFFFB01178300040A010101123EECA00000000000003EECA0464005"
-	$"3FFFFB01178222040A010102123EECA00000000000003EECA04640053FFFFB01"
-	$"178222040A010103123EECA00000000000003EECA04640053FFFFB0117812204"
-	$"0A010104123EECA00000000000003EECA04640053FFFFB01178122040A010105"
-	$"123EECA00000000000003EECA04640053FFFFB01178022040A010106123EECA0"
-	$"0000000000003EECA04640053FFFFB01178022040A010107123EECA000000000"
-	$"00003EECA04640053FFFFB01178022040A010108123EECA00000000000003EEC"
-	$"A04640053FFFFB01178022040A010109123EECA00000000000003EECA0464005"
-	$"3FFFFB01178022040A01010A123EECA00000000000003EECA04640053FFFFB01"
-	$"178022040A01010B123EECA00000000000003EECA04640053FFFFB0117802204"
-	$"0A01010C123EECA00000000000003EECA04640053FFFFB01178022040A01010D"
-	$"123EECA00000000000003EECA04640053FFFFB01178022040A02010E023EECA0"
-	$"0000000000003EECA04640053FFFFB0A01010F123EECA00000000000003EECA0"
-	$"4640053FFFFB01178000040A030110023EECA00000000000003EECA04640053F"
-	$"FFFB0A010111023EECA00000000000003EECA04640053FFFFB"
-};
-
-resource(1, "facebook") #'VICN' array {
-	$"6E6369660202000602000000C000004000000000009220244C000067003C7FFF"
-	$"1A5EA805FF0206111B1111BD01C0A72B4828BF72B8033FBBBA3C39463F5C4A46"
-	$"523C4ABC4D4ABB7A4ABC4DC3D234C59634C51C34C659BB0E54352C0208242824"
-	$"2624BA4724C94924C528245AB6245C265CBA355CC94B5CC5285C5A5C5CC9565C"
-	$"5A5CC5485CB64A5CBA7B5C26C951245A24C55D242824BA53242624020A000101"
-	$"000A01010000"
-};
-
-resource(2, "gtalk") #'VICN' array {
-	$"6E636966080501040046020106023E40000000000000003D4000494000470000"
-	$"7EFFFFFFFFE5E1DA02000602000000BBC0004000000000009220244AF0000000"
-	$"33CCFC3366FF02000602000000BA000040000000000092202448800000336699"
-	$"FF6699CC02000602000000B9000040000000000092202448E00000CC0000FFFF"
-	$"000002000602000000BA000040000000000092202448800000FF9900FFFBFF00"
-	$"02000602000000BA000040000000000092202448800000006600FF00CC000A02"
-	$"06C22622C7562239222E342E2B2E3D4146364441483C50404C3C504A444A4E55"
-	$"44CBB634CBB83E5E2A0206C22622C7562239222E342E2B2E3D4146364441483C"
-	$"50404C3C504C464A505744CBB634CBB83E5E2A02024C265928532A583B59335D"
-	$"350610CAFFFEAF375335543B3B5A3B5A395D325D355D2C5D274F275627483241"
-	$"2C413541BDA7C2A83942BDA7C2A8394A3F463F463C40324036402A40234F2346"
-	$"2358325E2A5E395EBF5C5A3F5CBF5C5A3F544053080234313C310404FE372C37"
-	$"393739373A393B383B3A3B3B393B3A3B390406FE0B4536403640363F363E383E"
-	$"373E383E393E393E3A403B3F3B413B453A0405FE03453C453445344533433244"
-	$"324332403240323F323E343E333E3408024D2C4D3C0803553C4F3655300D0A00"
-	$"01001001178400040A020101000A010102000A0101032021210A010204053021"
-	$"2101178200040A0102070630212101178200040A010108301D2101178200040A"
-	$"0102090830212101178200040A030103000A040204051001178200040A050207"
-	$"061001178200040A060108301C2001178200040A07020908100117820004"
-};
-