diff --git a/retroshare-gui/src/gui/emojione.qrc b/retroshare-gui/src/gui/emojione.qrc
index 1a2a513ac..bf90d00e1 100644
--- a/retroshare-gui/src/gui/emojione.qrc
+++ b/retroshare-gui/src/gui/emojione.qrc
@@ -2,123 +2,13 @@
   <qresource prefix="/">
     <file>emojione/00A9.png</file>
     <file>emojione/00AE.png</file>
-    <file>emojione/1F0CF.png</file>
-    <file>emojione/1F3A0.png</file>
-    <file>emojione/1F3A1.png</file>
-    <file>emojione/1F3A2.png</file>
-    <file>emojione/1F3A3.png</file>
-    <file>emojione/1F3A4.png</file>
-    <file>emojione/1F3A5.png</file>
-    <file>emojione/1F3A6.png</file>
-    <file>emojione/1F3A7.png</file>
-    <file>emojione/1F3A8.png</file>
-    <file>emojione/1F3A9.png</file>
-    <file>emojione/1F3AA.png</file>
-    <file>emojione/1F3AB.png</file>
-    <file>emojione/1F3AC.png</file>
-    <file>emojione/1F3AD.png</file>
-    <file>emojione/1F3AE.png</file>
-    <file>emojione/1F3AF.png</file>
-    <file>emojione/1F3B0.png</file>
-    <file>emojione/1F3B1.png</file>
-    <file>emojione/1F3B2.png</file>
-    <file>emojione/1F3B3.png</file>
-    <file>emojione/1F3B4.png</file>
-    <file>emojione/1F3B5.png</file>
-    <file>emojione/1F3B6.png</file>
-    <file>emojione/1F3B7.png</file>
-    <file>emojione/1F3B8.png</file>
-    <file>emojione/1F3B9.png</file>
-    <file>emojione/1F3BA.png</file>
-    <file>emojione/1F3BB.png</file>
-    <file>emojione/1F3BC.png</file>
-    <file>emojione/1F3BD.png</file>
-    <file>emojione/1F3BE.png</file>
-    <file>emojione/1F3BF.png</file>
-    <file>emojione/1F3C0.png</file>
-    <file>emojione/1F3C1.png</file>
-    <file>emojione/1F3C2.png</file>
-    <file>emojione/1F3C3.png</file>
-    <file>emojione/1F3C4.png</file>
-    <file>emojione/1F3C5.png</file>
-    <file>emojione/1F3C6.png</file>
-    <file>emojione/1F3C7.png</file>
-    <file>emojione/1F3C8.png</file>
-    <file>emojione/1F3C9.png</file>
-    <file>emojione/1F3CA.png</file>
-    <file>emojione/1F3CB.png</file>
-    <file>emojione/1F3CC.png</file>
-    <file>emojione/1F3CD.png</file>
-    <file>emojione/1F3CE.png</file>
-    <file>emojione/1F3D4.png</file>
-    <file>emojione/1F3D5.png</file>
-    <file>emojione/1F3D6.png</file>
-    <file>emojione/1F3D7.png</file>
-    <file>emojione/1F3D8.png</file>
-    <file>emojione/1F3D9.png</file>
-    <file>emojione/1F3DA.png</file>
-    <file>emojione/1F3DB.png</file>
-    <file>emojione/1F3DC.png</file>
-    <file>emojione/1F3DD.png</file>
-    <file>emojione/1F3DE.png</file>
-    <file>emojione/1F3DF.png</file>
-    <file>emojione/1F3E0.png</file>
-    <file>emojione/1F3E1.png</file>
-    <file>emojione/1F3E2.png</file>
-    <file>emojione/1F3E3.png</file>
-    <file>emojione/1F3E4.png</file>
-    <file>emojione/1F3E5.png</file>
-    <file>emojione/1F3E6.png</file>
-    <file>emojione/1F3E7.png</file>
-    <file>emojione/1F3E8.png</file>
-    <file>emojione/1F3E9.png</file>
-    <file>emojione/1F3EA.png</file>
-    <file>emojione/1F3EB.png</file>
-    <file>emojione/1F3EC.png</file>
-    <file>emojione/1F3ED.png</file>
-    <file>emojione/1F3EE.png</file>
-    <file>emojione/1F3EF.png</file>
-    <file>emojione/1F3F0.png</file>
-    <file>emojione/1F3F1.png</file>
-    <file>emojione/1F3F2.png</file>
-    <file>emojione/1F3F3.png</file>
-    <file>emojione/1F3F4.png</file>
-    <file>emojione/1F3F5.png</file>
-    <file>emojione/1F3F6.png</file>
-    <file>emojione/1F3F7.png</file>
     <file>emojione/1F004.png</file>
-    <file>emojione/1F4A0.png</file>
-    <file>emojione/1F4A1.png</file>
-    <file>emojione/1F4A2.png</file>
-    <file>emojione/1F4A3.png</file>
-    <file>emojione/1F4A4.png</file>
-    <file>emojione/1F4A5.png</file>
-    <file>emojione/1F4A6.png</file>
-    <file>emojione/1F4A7.png</file>
-    <file>emojione/1F4A8.png</file>
-    <file>emojione/1F4A9.png</file>
     <file>emojione/1F4AA.png</file>
     <file>emojione/1F4AB.png</file>
     <file>emojione/1F4AC.png</file>
     <file>emojione/1F4AD.png</file>
     <file>emojione/1F4AE.png</file>
     <file>emojione/1F4AF.png</file>
-    <file>emojione/1F4B0.png</file>
-    <file>emojione/1F4B1.png</file>
-    <file>emojione/1F4B2.png</file>
-    <file>emojione/1F4B3.png</file>
-    <file>emojione/1F4B4.png</file>
-    <file>emojione/1F4B5.png</file>
-    <file>emojione/1F4B6.png</file>
-    <file>emojione/1F4B7.png</file>
-    <file>emojione/1F4B8.png</file>
-    <file>emojione/1F4B9.png</file>
-    <file>emojione/1F4BA.png</file>
-    <file>emojione/1F4BB.png</file>
-    <file>emojione/1F4BC.png</file>
-    <file>emojione/1F4BD.png</file>
-    <file>emojione/1F4BE.png</file>
-    <file>emojione/1F4BF.png</file>
     <file>emojione/1F4C0.png</file>
     <file>emojione/1F4C1.png</file>
     <file>emojione/1F4C2.png</file>
@@ -182,136 +72,7 @@
     <file>emojione/1F4FC.png</file>
     <file>emojione/1F4FD.png</file>
     <file>emojione/1F4FE.png</file>
-    <file>emojione/1F5A5.png</file>
-    <file>emojione/1F5A6.png</file>
-    <file>emojione/1F5A7.png</file>
-    <file>emojione/1F5A8.png</file>
-    <file>emojione/1F5A9.png</file>
-    <file>emojione/1F5AA.png</file>
-    <file>emojione/1F5AB.png</file>
-    <file>emojione/1F5AD.png</file>
-    <file>emojione/1F5AE.png</file>
-    <file>emojione/1F5AF.png</file>
-    <file>emojione/1F5B2.png</file>
-    <file>emojione/1F5B3.png</file>
-    <file>emojione/1F5B4.png</file>
-    <file>emojione/1F5B8.png</file>
-    <file>emojione/1F5B9.png</file>
-    <file>emojione/1F5BC.png</file>
-    <file>emojione/1F5BD.png</file>
-    <file>emojione/1F5BE.png</file>
-    <file>emojione/1F5C0.png</file>
-    <file>emojione/1F5C1.png</file>
-    <file>emojione/1F5C2.png</file>
-    <file>emojione/1F5C3.png</file>
-    <file>emojione/1F5C4.png</file>
-    <file>emojione/1F5C6.png</file>
-    <file>emojione/1F5C7.png</file>
-    <file>emojione/1F5C9.png</file>
-    <file>emojione/1F5CA.png</file>
-    <file>emojione/1F5CE.png</file>
-    <file>emojione/1F5CF.png</file>
-    <file>emojione/1F5D0.png</file>
-    <file>emojione/1F5D1.png</file>
-    <file>emojione/1F5D2.png</file>
-    <file>emojione/1F5D3.png</file>
-    <file>emojione/1F5D4.png</file>
-    <file>emojione/1F5D8.png</file>
-    <file>emojione/1F5D9.png</file>
-    <file>emojione/1F5DC.png</file>
-    <file>emojione/1F5DD.png</file>
-    <file>emojione/1F5DE.png</file>
-    <file>emojione/1F5E0.png</file>
-    <file>emojione/1F5E1.png</file>
     <file>emojione/1F5E2.png</file>
-    <file>emojione/1F5E3.png</file>
-    <file>emojione/1F5E8.png</file>
-    <file>emojione/1F5E9.png</file>
-    <file>emojione/1F5EA.png</file>
-    <file>emojione/1F5EB.png</file>
-    <file>emojione/1F5EC.png</file>
-    <file>emojione/1F5ED.png</file>
-    <file>emojione/1F5EE.png</file>
-    <file>emojione/1F5EF.png</file>
-    <file>emojione/1F5F0.png</file>
-    <file>emojione/1F5F1.png</file>
-    <file>emojione/1F5F2.png</file>
-    <file>emojione/1F5F3.png</file>
-    <file>emojione/1F5F4.png</file>
-    <file>emojione/1F5F5.png</file>
-    <file>emojione/1F5F8.png</file>
-    <file>emojione/1F5F9.png</file>
-    <file>emojione/1F5FA.png</file>
-    <file>emojione/1F5FB.png</file>
-    <file>emojione/1F5FC.png</file>
-    <file>emojione/1F5FD.png</file>
-    <file>emojione/1F5FE.png</file>
-    <file>emojione/1F5FF.png</file>
-    <file>emojione/1F6A0.png</file>
-    <file>emojione/1F6A1.png</file>
-    <file>emojione/1F6A2.png</file>
-    <file>emojione/1F6A3.png</file>
-    <file>emojione/1F6A4.png</file>
-    <file>emojione/1F6A5.png</file>
-    <file>emojione/1F6A6.png</file>
-    <file>emojione/1F6A7.png</file>
-    <file>emojione/1F6A8.png</file>
-    <file>emojione/1F6A9.png</file>
-    <file>emojione/1F6AA.png</file>
-    <file>emojione/1F6AB.png</file>
-    <file>emojione/1F6AC.png</file>
-    <file>emojione/1F6AD.png</file>
-    <file>emojione/1F6AE.png</file>
-    <file>emojione/1F6AF.png</file>
-    <file>emojione/1F6B0.png</file>
-    <file>emojione/1F6B1.png</file>
-    <file>emojione/1F6B2.png</file>
-    <file>emojione/1F6B3.png</file>
-    <file>emojione/1F6B4.png</file>
-    <file>emojione/1F6B5.png</file>
-    <file>emojione/1F6B6.png</file>
-    <file>emojione/1F6B7.png</file>
-    <file>emojione/1F6B8.png</file>
-    <file>emojione/1F6B9.png</file>
-    <file>emojione/1F6BA.png</file>
-    <file>emojione/1F6BB.png</file>
-    <file>emojione/1F6BC.png</file>
-    <file>emojione/1F6BD.png</file>
-    <file>emojione/1F6BE.png</file>
-    <file>emojione/1F6BF.png</file>
-    <file>emojione/1F6C0.png</file>
-    <file>emojione/1F6C1.png</file>
-    <file>emojione/1F6C2.png</file>
-    <file>emojione/1F6C3.png</file>
-    <file>emojione/1F6C4.png</file>
-    <file>emojione/1F6C5.png</file>
-    <file>emojione/1F6C6.png</file>
-    <file>emojione/1F6C7.png</file>
-    <file>emojione/1F6C8.png</file>
-    <file>emojione/1F6C9.png</file>
-    <file>emojione/1F6CA.png</file>
-    <file>emojione/1F6CB.png</file>
-    <file>emojione/1F6CC.png</file>
-    <file>emojione/1F6CD.png</file>
-    <file>emojione/1F6CE.png</file>
-    <file>emojione/1F6CF.png</file>
-    <file>emojione/1F6E0.png</file>
-    <file>emojione/1F6E1.png</file>
-    <file>emojione/1F6E2.png</file>
-    <file>emojione/1F6E3.png</file>
-    <file>emojione/1F6E4.png</file>
-    <file>emojione/1F6E5.png</file>
-    <file>emojione/1F6E6.png</file>
-    <file>emojione/1F6E7.png</file>
-    <file>emojione/1F6E8.png</file>
-    <file>emojione/1F6E9.png</file>
-    <file>emojione/1F6EA.png</file>
-    <file>emojione/1F6EB.png</file>
-    <file>emojione/1F6EC.png</file>
-    <file>emojione/1F6F0.png</file>
-    <file>emojione/1F6F1.png</file>
-    <file>emojione/1F6F2.png</file>
-    <file>emojione/1F6F3.png</file>
     <file>emojione/1F17E.png</file>
     <file>emojione/1F17F.png</file>
     <file>emojione/1F18E.png</file>
@@ -319,79 +80,12 @@
     <file>emojione/1F21A.png</file>
     <file>emojione/1F22F.png</file>
     <file>emojione/1F23A.png</file>
-    <file>emojione/1F30A.png</file>
-    <file>emojione/1F30B.png</file>
-    <file>emojione/1F30C.png</file>
-    <file>emojione/1F30D.png</file>
-    <file>emojione/1F30E.png</file>
-    <file>emojione/1F30F.png</file>
-    <file>emojione/1F31A.png</file>
-    <file>emojione/1F31B.png</file>
-    <file>emojione/1F31C.png</file>
-    <file>emojione/1F31D.png</file>
-    <file>emojione/1F31E.png</file>
-    <file>emojione/1F31F.png</file>
     <file>emojione/1F32A.png</file>
     <file>emojione/1F32B.png</file>
     <file>emojione/1F32C.png</file>
-    <file>emojione/1F33A.png</file>
-    <file>emojione/1F33B.png</file>
-    <file>emojione/1F33C.png</file>
-    <file>emojione/1F33D.png</file>
-    <file>emojione/1F33E.png</file>
-    <file>emojione/1F33F.png</file>
-    <file>emojione/1F34A.png</file>
-    <file>emojione/1F34B.png</file>
-    <file>emojione/1F34C.png</file>
-    <file>emojione/1F34D.png</file>
-    <file>emojione/1F34E.png</file>
-    <file>emojione/1F34F.png</file>
-    <file>emojione/1F35A.png</file>
-    <file>emojione/1F35B.png</file>
-    <file>emojione/1F35C.png</file>
-    <file>emojione/1F35D.png</file>
-    <file>emojione/1F35E.png</file>
-    <file>emojione/1F35F.png</file>
     <file>emojione/1F36A.png</file>
-    <file>emojione/1F36B.png</file>
-    <file>emojione/1F36C.png</file>
-    <file>emojione/1F36D.png</file>
-    <file>emojione/1F36E.png</file>
-    <file>emojione/1F36F.png</file>
     <file>emojione/1F37A.png</file>
     <file>emojione/1F37B.png</file>
-    <file>emojione/1F37C.png</file>
-    <file>emojione/1F37D.png</file>
-    <file>emojione/1F38A.png</file>
-    <file>emojione/1F38B.png</file>
-    <file>emojione/1F38C.png</file>
-    <file>emojione/1F38D.png</file>
-    <file>emojione/1F38E.png</file>
-    <file>emojione/1F38F.png</file>
-    <file>emojione/1F39A.png</file>
-    <file>emojione/1F39B.png</file>
-    <file>emojione/1F39C.png</file>
-    <file>emojione/1F39D.png</file>
-    <file>emojione/1F39E.png</file>
-    <file>emojione/1F39F.png</file>
-    <file>emojione/1F40A.png</file>
-    <file>emojione/1F40B.png</file>
-    <file>emojione/1F40C.png</file>
-    <file>emojione/1F40D.png</file>
-    <file>emojione/1F40E.png</file>
-    <file>emojione/1F40F.png</file>
-    <file>emojione/1F41A.png</file>
-    <file>emojione/1F41B.png</file>
-    <file>emojione/1F41C.png</file>
-    <file>emojione/1F41D.png</file>
-    <file>emojione/1F41E.png</file>
-    <file>emojione/1F41F.png</file>
-    <file>emojione/1F42A.png</file>
-    <file>emojione/1F42B.png</file>
-    <file>emojione/1F42C.png</file>
-    <file>emojione/1F42D.png</file>
-    <file>emojione/1F42E.png</file>
-    <file>emojione/1F42F.png</file>
     <file>emojione/1F43A.png</file>
     <file>emojione/1F43B.png</file>
     <file>emojione/1F43C.png</file>
@@ -404,12 +98,6 @@
     <file>emojione/1F44D.png</file>
     <file>emojione/1F44E.png</file>
     <file>emojione/1F44F.png</file>
-    <file>emojione/1F45A.png</file>
-    <file>emojione/1F45B.png</file>
-    <file>emojione/1F45C.png</file>
-    <file>emojione/1F45D.png</file>
-    <file>emojione/1F45E.png</file>
-    <file>emojione/1F45F.png</file>
     <file>emojione/1F46A.png</file>
     <file>emojione/1F46B.png</file>
     <file>emojione/1F46C.png</file>
@@ -434,52 +122,7 @@
     <file>emojione/1F49D.png</file>
     <file>emojione/1F49E.png</file>
     <file>emojione/1F49F.png</file>
-    <file>emojione/1F50A.png</file>
-    <file>emojione/1F50B.png</file>
-    <file>emojione/1F50C.png</file>
-    <file>emojione/1F50D.png</file>
-    <file>emojione/1F50E.png</file>
-    <file>emojione/1F50F.png</file>
-    <file>emojione/1F51A.png</file>
-    <file>emojione/1F51B.png</file>
-    <file>emojione/1F51C.png</file>
-    <file>emojione/1F51D.png</file>
-    <file>emojione/1F51E.png</file>
-    <file>emojione/1F51F.png</file>
-    <file>emojione/1F52A.png</file>
-    <file>emojione/1F52B.png</file>
-    <file>emojione/1F52C.png</file>
-    <file>emojione/1F52D.png</file>
-    <file>emojione/1F52E.png</file>
-    <file>emojione/1F52F.png</file>
-    <file>emojione/1F53A.png</file>
-    <file>emojione/1F53B.png</file>
-    <file>emojione/1F53C.png</file>
-    <file>emojione/1F53D.png</file>
     <file>emojione/1F54A.png</file>
-    <file>emojione/1F55A.png</file>
-    <file>emojione/1F55B.png</file>
-    <file>emojione/1F55C.png</file>
-    <file>emojione/1F55D.png</file>
-    <file>emojione/1F55E.png</file>
-    <file>emojione/1F55F.png</file>
-    <file>emojione/1F56A.png</file>
-    <file>emojione/1F56B.png</file>
-    <file>emojione/1F56C.png</file>
-    <file>emojione/1F56D.png</file>
-    <file>emojione/1F56E.png</file>
-    <file>emojione/1F56F.png</file>
-    <file>emojione/1F57B.png</file>
-    <file>emojione/1F57E.png</file>
-    <file>emojione/1F57F.png</file>
-    <file>emojione/1F58A.png</file>
-    <file>emojione/1F58B.png</file>
-    <file>emojione/1F58C.png</file>
-    <file>emojione/1F58D.png</file>
-    <file>emojione/1F58E.png</file>
-    <file>emojione/1F58F.png</file>
-    <file>emojione/1F59E.png</file>
-    <file>emojione/1F59F.png</file>
     <file>emojione/1F60A.png</file>
     <file>emojione/1F60B.png</file>
     <file>emojione/1F60C.png</file>
@@ -709,25 +352,7 @@
     <file>emojione/1F466.png</file>
     <file>emojione/1F467.png</file>
     <file>emojione/1F468.png</file>
-    <file>emojione/1F468-1F468-1F466.png</file>
-    <file>emojione/1F468-1F468-1F466-1F466.png</file>
-    <file>emojione/1F468-1F468-1F467.png</file>
-    <file>emojione/1F468-1F468-1F467-1F466.png</file>
-    <file>emojione/1F468-1F468-1F467-1F467.png</file>
-    <file>emojione/1F468-1F469-1F466-1F466.png</file>
-    <file>emojione/1F468-1F469-1F467.png</file>
-    <file>emojione/1F468-1F469-1F467-1F466.png</file>
-    <file>emojione/1F468-1F469-1F467-1F467.png</file>
-    <file>emojione/1F468-2764-1F48B-1F468.png</file>
-    <file>emojione/1F468-2764-1F468.png</file>
     <file>emojione/1F469.png</file>
-    <file>emojione/1F469-1F469-1F466.png</file>
-    <file>emojione/1F469-1F469-1F466-1F466.png</file>
-    <file>emojione/1F469-1F469-1F467.png</file>
-    <file>emojione/1F469-1F469-1F467-1F466.png</file>
-    <file>emojione/1F469-1F469-1F467-1F467.png</file>
-    <file>emojione/1F469-2764-1F48B-1F469.png</file>
-    <file>emojione/1F469-2764-1F469.png</file>
     <file>emojione/1F470.png</file>
     <file>emojione/1F471.png</file>
     <file>emojione/1F472.png</file>
@@ -758,93 +383,8 @@
     <file>emojione/1F497.png</file>
     <file>emojione/1F498.png</file>
     <file>emojione/1F499.png</file>
-    <file>emojione/1F500.png</file>
-    <file>emojione/1F501.png</file>
-    <file>emojione/1F502.png</file>
-    <file>emojione/1F503.png</file>
-    <file>emojione/1F504.png</file>
-    <file>emojione/1F505.png</file>
-    <file>emojione/1F506.png</file>
-    <file>emojione/1F507.png</file>
-    <file>emojione/1F508.png</file>
-    <file>emojione/1F509.png</file>
-    <file>emojione/1F510.png</file>
-    <file>emojione/1F511.png</file>
-    <file>emojione/1F512.png</file>
-    <file>emojione/1F513.png</file>
-    <file>emojione/1F514.png</file>
-    <file>emojione/1F515.png</file>
-    <file>emojione/1F516.png</file>
-    <file>emojione/1F517.png</file>
-    <file>emojione/1F518.png</file>
-    <file>emojione/1F519.png</file>
-    <file>emojione/1F520.png</file>
-    <file>emojione/1F521.png</file>
-    <file>emojione/1F522.png</file>
-    <file>emojione/1F523.png</file>
-    <file>emojione/1F524.png</file>
-    <file>emojione/1F525.png</file>
-    <file>emojione/1F526.png</file>
-    <file>emojione/1F527.png</file>
-    <file>emojione/1F528.png</file>
-    <file>emojione/1F529.png</file>
-    <file>emojione/1F530.png</file>
-    <file>emojione/1F531.png</file>
-    <file>emojione/1F532.png</file>
-    <file>emojione/1F533.png</file>
-    <file>emojione/1F534.png</file>
-    <file>emojione/1F535.png</file>
-    <file>emojione/1F536.png</file>
-    <file>emojione/1F537.png</file>
-    <file>emojione/1F538.png</file>
-    <file>emojione/1F539.png</file>
-    <file>emojione/1F546.png</file>
-    <file>emojione/1F547.png</file>
-    <file>emojione/1F548.png</file>
-    <file>emojione/1F549.png</file>
-    <file>emojione/1F550.png</file>
-    <file>emojione/1F551.png</file>
-    <file>emojione/1F552.png</file>
-    <file>emojione/1F553.png</file>
-    <file>emojione/1F554.png</file>
-    <file>emojione/1F555.png</file>
-    <file>emojione/1F556.png</file>
-    <file>emojione/1F557.png</file>
-    <file>emojione/1F558.png</file>
-    <file>emojione/1F559.png</file>
-    <file>emojione/1F560.png</file>
-    <file>emojione/1F561.png</file>
-    <file>emojione/1F562.png</file>
-    <file>emojione/1F563.png</file>
-    <file>emojione/1F564.png</file>
-    <file>emojione/1F565.png</file>
-    <file>emojione/1F566.png</file>
-    <file>emojione/1F567.png</file>
-    <file>emojione/1F568.png</file>
-    <file>emojione/1F569.png</file>
-    <file>emojione/1F570.png</file>
-    <file>emojione/1F571.png</file>
-    <file>emojione/1F572.png</file>
-    <file>emojione/1F573.png</file>
     <file>emojione/1F574.png</file>
     <file>emojione/1F575.png</file>
-    <file>emojione/1F576.png</file>
-    <file>emojione/1F577.png</file>
-    <file>emojione/1F578.png</file>
-    <file>emojione/1F579.png</file>
-    <file>emojione/1F581.png</file>
-    <file>emojione/1F582.png</file>
-    <file>emojione/1F583.png</file>
-    <file>emojione/1F585.png</file>
-    <file>emojione/1F586.png</file>
-    <file>emojione/1F587.png</file>
-    <file>emojione/1F588.png</file>
-    <file>emojione/1F589.png</file>
-    <file>emojione/1F590.png</file>
-    <file>emojione/1F591.png</file>
-    <file>emojione/1F592.png</file>
-    <file>emojione/1F593.png</file>
-    <file>emojione/1F594.png</file>
     <file>emojione/1F595.png</file>
     <file>emojione/1F596.png</file>
     <file>emojione/1F597.png</file>
@@ -927,7 +467,6 @@
     <file>emojione/2B55.png</file>
     <file>emojione/21A9.png</file>
     <file>emojione/21AA.png</file>
-    <file>emojione/0023-20E3.png</file>
     <file>emojione/23E9.png</file>
     <file>emojione/23EA.png</file>
     <file>emojione/23EB.png</file>
@@ -962,16 +501,6 @@
     <file>emojione/27A1.png</file>
     <file>emojione/27B0.png</file>
     <file>emojione/27BF.png</file>
-    <file>emojione/0030-20E3.png</file>
-    <file>emojione/0031-20E3.png</file>
-    <file>emojione/0032-20E3.png</file>
-    <file>emojione/0033-20E3.png</file>
-    <file>emojione/0034-20E3.png</file>
-    <file>emojione/0035-20E3.png</file>
-    <file>emojione/0036-20E3.png</file>
-    <file>emojione/0037-20E3.png</file>
-    <file>emojione/0038-20E3.png</file>
-    <file>emojione/0039-20E3.png</file>
     <file>emojione/203C.png</file>
     <file>emojione/231A.png</file>
     <file>emojione/231B.png</file>
@@ -994,51 +523,13 @@
     <file>emojione/274E.png</file>
     <file>emojione/303D.png</file>
     <file>emojione/2049.png</file>
-    <file>emojione/2122.png</file>
-    <file>emojione/2139.png</file>
-    <file>emojione/2194.png</file>
-    <file>emojione/2195.png</file>
-    <file>emojione/2196.png</file>
-    <file>emojione/2197.png</file>
-    <file>emojione/2198.png</file>
-    <file>emojione/2199.png</file>
     <file>emojione/2600.png</file>
     <file>emojione/2601.png</file>
     <file>emojione/2611.png</file>
     <file>emojione/2614.png</file>
     <file>emojione/2615.png</file>
-    <file>emojione/2648.png</file>
-    <file>emojione/2649.png</file>
-    <file>emojione/2650.png</file>
-    <file>emojione/2651.png</file>
-    <file>emojione/2652.png</file>
-    <file>emojione/2653.png</file>
-    <file>emojione/2660.png</file>
-    <file>emojione/2663.png</file>
-    <file>emojione/2665.png</file>
-    <file>emojione/2666.png</file>
-    <file>emojione/2668.png</file>
-    <file>emojione/2693.png</file>
-    <file>emojione/2702.png</file>
-    <file>emojione/2705.png</file>
     <file>emojione/2708.png</file>
-    <file>emojione/2709.png</file>
-    <file>emojione/2712.png</file>
-    <file>emojione/2714.png</file>
-    <file>emojione/2716.png</file>
-    <file>emojione/2728.png</file>
-    <file>emojione/2733.png</file>
-    <file>emojione/2734.png</file>
-    <file>emojione/2744.png</file>
-    <file>emojione/2747.png</file>
-    <file>emojione/2753.png</file>
-    <file>emojione/2754.png</file>
-    <file>emojione/2755.png</file>
-    <file>emojione/2757.png</file>
     <file>emojione/2764.png</file>
-    <file>emojione/2795.png</file>
-    <file>emojione/2796.png</file>
-    <file>emojione/2797.png</file>
     <file>emojione/2934.png</file>
     <file>emojione/2935.png</file>
     <file>emojione/3030.png</file>
diff --git a/retroshare-gui/src/gui/smileys/act-up.png b/retroshare-gui/src/gui/smileys/act-up.png
deleted file mode 100644
index a6ed2c482..000000000
Binary files a/retroshare-gui/src/gui/smileys/act-up.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/afraid.png b/retroshare-gui/src/gui/smileys/afraid.png
deleted file mode 100644
index 623a5d26e..000000000
Binary files a/retroshare-gui/src/gui/smileys/afraid.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/airplane.png b/retroshare-gui/src/gui/smileys/airplane.png
deleted file mode 100644
index dd87f7a0d..000000000
Binary files a/retroshare-gui/src/gui/smileys/airplane.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/alien.png b/retroshare-gui/src/gui/smileys/alien.png
deleted file mode 100644
index b9ca044e3..000000000
Binary files a/retroshare-gui/src/gui/smileys/alien.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/amorous.png b/retroshare-gui/src/gui/smileys/amorous.png
deleted file mode 100644
index e752acc97..000000000
Binary files a/retroshare-gui/src/gui/smileys/amorous.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/angel.png b/retroshare-gui/src/gui/smileys/angel.png
deleted file mode 100644
index cdf33893e..000000000
Binary files a/retroshare-gui/src/gui/smileys/angel.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/angry.png b/retroshare-gui/src/gui/smileys/angry.png
deleted file mode 100644
index 3b57d969b..000000000
Binary files a/retroshare-gui/src/gui/smileys/angry.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/arrogant.png b/retroshare-gui/src/gui/smileys/arrogant.png
deleted file mode 100644
index 61093e475..000000000
Binary files a/retroshare-gui/src/gui/smileys/arrogant.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/at-wits-end.png b/retroshare-gui/src/gui/smileys/at-wits-end.png
deleted file mode 100644
index 218e5319a..000000000
Binary files a/retroshare-gui/src/gui/smileys/at-wits-end.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bad.png b/retroshare-gui/src/gui/smileys/bad.png
deleted file mode 100644
index a297f8680..000000000
Binary files a/retroshare-gui/src/gui/smileys/bad.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bashful.png b/retroshare-gui/src/gui/smileys/bashful.png
deleted file mode 100644
index 92a99836f..000000000
Binary files a/retroshare-gui/src/gui/smileys/bashful.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/beat-up.png b/retroshare-gui/src/gui/smileys/beat-up.png
deleted file mode 100644
index d1367cefa..000000000
Binary files a/retroshare-gui/src/gui/smileys/beat-up.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/beauty.png b/retroshare-gui/src/gui/smileys/beauty.png
deleted file mode 100644
index 95943affc..000000000
Binary files a/retroshare-gui/src/gui/smileys/beauty.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/beer.png b/retroshare-gui/src/gui/smileys/beer.png
deleted file mode 100644
index 6f82e46b9..000000000
Binary files a/retroshare-gui/src/gui/smileys/beer.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/blowkiss.png b/retroshare-gui/src/gui/smileys/blowkiss.png
deleted file mode 100644
index 132df9941..000000000
Binary files a/retroshare-gui/src/gui/smileys/blowkiss.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bomb.png b/retroshare-gui/src/gui/smileys/bomb.png
deleted file mode 100644
index f50d40758..000000000
Binary files a/retroshare-gui/src/gui/smileys/bomb.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bored.png b/retroshare-gui/src/gui/smileys/bored.png
deleted file mode 100644
index e063f962c..000000000
Binary files a/retroshare-gui/src/gui/smileys/bored.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bowl.png b/retroshare-gui/src/gui/smileys/bowl.png
deleted file mode 100644
index e800c7287..000000000
Binary files a/retroshare-gui/src/gui/smileys/bowl.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/boy.png b/retroshare-gui/src/gui/smileys/boy.png
deleted file mode 100644
index 3e70c5471..000000000
Binary files a/retroshare-gui/src/gui/smileys/boy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/brb.png b/retroshare-gui/src/gui/smileys/brb.png
deleted file mode 100644
index 61b3a146a..000000000
Binary files a/retroshare-gui/src/gui/smileys/brb.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bulgy-eyes.png b/retroshare-gui/src/gui/smileys/bulgy-eyes.png
deleted file mode 100644
index 8cc7c3cd6..000000000
Binary files a/retroshare-gui/src/gui/smileys/bulgy-eyes.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bunny.png b/retroshare-gui/src/gui/smileys/bunny.png
deleted file mode 100644
index 77d97c4ff..000000000
Binary files a/retroshare-gui/src/gui/smileys/bunny.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/bye.png b/retroshare-gui/src/gui/smileys/bye.png
deleted file mode 100644
index 9bfaeaa1a..000000000
Binary files a/retroshare-gui/src/gui/smileys/bye.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cake.png b/retroshare-gui/src/gui/smileys/cake.png
deleted file mode 100644
index 519fd4cea..000000000
Binary files a/retroshare-gui/src/gui/smileys/cake.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/call-me.png b/retroshare-gui/src/gui/smileys/call-me.png
deleted file mode 100644
index 1044de0c5..000000000
Binary files a/retroshare-gui/src/gui/smileys/call-me.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/camera.png b/retroshare-gui/src/gui/smileys/camera.png
deleted file mode 100644
index d8ccc97b6..000000000
Binary files a/retroshare-gui/src/gui/smileys/camera.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/can.png b/retroshare-gui/src/gui/smileys/can.png
deleted file mode 100644
index e4792ccd0..000000000
Binary files a/retroshare-gui/src/gui/smileys/can.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/car.png b/retroshare-gui/src/gui/smileys/car.png
deleted file mode 100644
index 97622bc2c..000000000
Binary files a/retroshare-gui/src/gui/smileys/car.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cat.png b/retroshare-gui/src/gui/smileys/cat.png
deleted file mode 100644
index 4b602dae8..000000000
Binary files a/retroshare-gui/src/gui/smileys/cat.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/chicken.png b/retroshare-gui/src/gui/smileys/chicken.png
deleted file mode 100644
index 8356dbf09..000000000
Binary files a/retroshare-gui/src/gui/smileys/chicken.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/chilli.png b/retroshare-gui/src/gui/smileys/chilli.png
deleted file mode 100644
index a9873bcb0..000000000
Binary files a/retroshare-gui/src/gui/smileys/chilli.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cigarette.png b/retroshare-gui/src/gui/smileys/cigarette.png
deleted file mode 100644
index 68cffedf0..000000000
Binary files a/retroshare-gui/src/gui/smileys/cigarette.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/clap.png b/retroshare-gui/src/gui/smileys/clap.png
deleted file mode 100644
index d0b4ae6e6..000000000
Binary files a/retroshare-gui/src/gui/smileys/clap.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/clock.png b/retroshare-gui/src/gui/smileys/clock.png
deleted file mode 100644
index e0bbb8547..000000000
Binary files a/retroshare-gui/src/gui/smileys/clock.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cloudy.png b/retroshare-gui/src/gui/smileys/cloudy.png
deleted file mode 100644
index 4202a0ef2..000000000
Binary files a/retroshare-gui/src/gui/smileys/cloudy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/clover.png b/retroshare-gui/src/gui/smileys/clover.png
deleted file mode 100644
index c90494ad5..000000000
Binary files a/retroshare-gui/src/gui/smileys/clover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/clown.png b/retroshare-gui/src/gui/smileys/clown.png
deleted file mode 100644
index bfc9552d1..000000000
Binary files a/retroshare-gui/src/gui/smileys/clown.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/coffee.png b/retroshare-gui/src/gui/smileys/coffee.png
deleted file mode 100644
index 51c4f90ad..000000000
Binary files a/retroshare-gui/src/gui/smileys/coffee.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/coins.png b/retroshare-gui/src/gui/smileys/coins.png
deleted file mode 100644
index 7e06f3eab..000000000
Binary files a/retroshare-gui/src/gui/smileys/coins.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cold.png b/retroshare-gui/src/gui/smileys/cold.png
deleted file mode 100644
index 83ba4d4a9..000000000
Binary files a/retroshare-gui/src/gui/smileys/cold.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/computer.png b/retroshare-gui/src/gui/smileys/computer.png
deleted file mode 100644
index 1b11a0932..000000000
Binary files a/retroshare-gui/src/gui/smileys/computer.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/confused.png b/retroshare-gui/src/gui/smileys/confused.png
deleted file mode 100644
index 3b77b55dc..000000000
Binary files a/retroshare-gui/src/gui/smileys/confused.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/console.png b/retroshare-gui/src/gui/smileys/console.png
deleted file mode 100644
index 4933bc5ee..000000000
Binary files a/retroshare-gui/src/gui/smileys/console.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cool.png b/retroshare-gui/src/gui/smileys/cool.png
deleted file mode 100644
index a4788a820..000000000
Binary files a/retroshare-gui/src/gui/smileys/cool.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cow.png b/retroshare-gui/src/gui/smileys/cow.png
deleted file mode 100644
index 62657da08..000000000
Binary files a/retroshare-gui/src/gui/smileys/cow.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cowboy.png b/retroshare-gui/src/gui/smileys/cowboy.png
deleted file mode 100644
index 8d895a960..000000000
Binary files a/retroshare-gui/src/gui/smileys/cowboy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/crying.png b/retroshare-gui/src/gui/smileys/crying.png
deleted file mode 100644
index ec9c6f47c..000000000
Binary files a/retroshare-gui/src/gui/smileys/crying.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/curl-lip.png b/retroshare-gui/src/gui/smileys/curl-lip.png
deleted file mode 100644
index fc33918e4..000000000
Binary files a/retroshare-gui/src/gui/smileys/curl-lip.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/curse.png b/retroshare-gui/src/gui/smileys/curse.png
deleted file mode 100644
index c1d20588a..000000000
Binary files a/retroshare-gui/src/gui/smileys/curse.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cute.png b/retroshare-gui/src/gui/smileys/cute.png
deleted file mode 100644
index f76bce10c..000000000
Binary files a/retroshare-gui/src/gui/smileys/cute.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/cyclops.png b/retroshare-gui/src/gui/smileys/cyclops.png
deleted file mode 100644
index 49b2f72b3..000000000
Binary files a/retroshare-gui/src/gui/smileys/cyclops.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/dance.png b/retroshare-gui/src/gui/smileys/dance.png
deleted file mode 100644
index 60e44d5db..000000000
Binary files a/retroshare-gui/src/gui/smileys/dance.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/dazed.png b/retroshare-gui/src/gui/smileys/dazed.png
deleted file mode 100644
index 293736055..000000000
Binary files a/retroshare-gui/src/gui/smileys/dazed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/desire.png b/retroshare-gui/src/gui/smileys/desire.png
deleted file mode 100644
index a04d2926b..000000000
Binary files a/retroshare-gui/src/gui/smileys/desire.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/devil.png b/retroshare-gui/src/gui/smileys/devil.png
deleted file mode 100644
index d7d0f46b4..000000000
Binary files a/retroshare-gui/src/gui/smileys/devil.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/disappointed.png b/retroshare-gui/src/gui/smileys/disappointed.png
deleted file mode 100644
index ab307be52..000000000
Binary files a/retroshare-gui/src/gui/smileys/disappointed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/disdain.png b/retroshare-gui/src/gui/smileys/disdain.png
deleted file mode 100644
index a122e7825..000000000
Binary files a/retroshare-gui/src/gui/smileys/disdain.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/doctor.png b/retroshare-gui/src/gui/smileys/doctor.png
deleted file mode 100644
index 6183061a6..000000000
Binary files a/retroshare-gui/src/gui/smileys/doctor.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/dog.png b/retroshare-gui/src/gui/smileys/dog.png
deleted file mode 100644
index d8c1ddf6f..000000000
Binary files a/retroshare-gui/src/gui/smileys/dog.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/doh.png b/retroshare-gui/src/gui/smileys/doh.png
deleted file mode 100644
index 66e9679d8..000000000
Binary files a/retroshare-gui/src/gui/smileys/doh.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/dont-know.png b/retroshare-gui/src/gui/smileys/dont-know.png
deleted file mode 100644
index d6bc7eda9..000000000
Binary files a/retroshare-gui/src/gui/smileys/dont-know.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/drink.png b/retroshare-gui/src/gui/smileys/drink.png
deleted file mode 100644
index 563ab9402..000000000
Binary files a/retroshare-gui/src/gui/smileys/drink.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/drool.png b/retroshare-gui/src/gui/smileys/drool.png
deleted file mode 100644
index 5771d5bfa..000000000
Binary files a/retroshare-gui/src/gui/smileys/drool.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/embarrassed.png b/retroshare-gui/src/gui/smileys/embarrassed.png
deleted file mode 100644
index f8ca79f13..000000000
Binary files a/retroshare-gui/src/gui/smileys/embarrassed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/emotes.acs b/retroshare-gui/src/gui/smileys/emotes.acs
deleted file mode 100644
index 8ebd84dcf..000000000
--- a/retroshare-gui/src/gui/smileys/emotes.acs
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-":-)|:)":"smileys/happy.png";
-":-D|:D":"smileys/excited.png";
-";-)|;)":"smileys/wink.png";
-":'(":"smileys/crying.png";
-":-O|:O":"smileys/shocked.png";
-":-S|:S":"smileys/confused.png";
-":$|:-$":"smileys/embarrassed.png";
-":-(|:(":"smileys/sad.png";
-":-*|:-{}":"smileys/kissing.png";
-":-P|:P":"smileys/tongue.png";
-"$-)|$)":"smileys/coins.png";
-":-@":"smileys/angry.png";
-"8-)":"smileys/eyeroll.png";
-"=))|:-j|:-J":"smileys/rotfl.png";
-"(B)|(b)":"smileys/beer.png";
-"(@)":"smileys/cat.png";
-"(P)|(p)":"smileys/camera.png";
-"(C)|(c)":"smileys/coffee.png";
-"*JOKINGLY*|:))|:-))":"smileys/laugh.png";
-"*TIRED*":"smileys/sleeping.png";
-"(bj)|baijiu":"smileys/liquor.png";
-"(L)|(l)":"smileys/love.png";
-"(U)|(u)":"smileys/love-over.png";
-"(S)":"smileys/moon.png";
-"(mp)":"smileys/mobile.png";
-"(pi)":"smileys/pizza.png";
-":)-":"smileys/peace.png";
-"(T)|(t)":"smileys/phone.png";
-"P)":"smileys/pirate.png";
-"(~~)":"smileys/pumpkin.png";
-":X|:x|:-x|:-X":"smileys/amorous.png";
-"(ip)":"smileys/island.png";
-"(^)":"smileys/cake.png";
-"<:-P|<:-p":"smileys/party.png";
-"(O)|(o)":"smileys/clock.png";
-"(um)":"smileys/umbrella.png";
-"(6)":"smileys/face-devil-grin48.png";
-"(S)":"smileys/moon.png"
-"*-:)":"smileys/lamp.png"
-"(Y)|(y)":"smileys/good.png"
-"(N)|(n)":"smileys/bad.png"
-"(D)|(d)":"smileys/drink.png"
-"(ap)":"smileys/airplane.png"
-"(tu)":"smileys/turtle.png"
-":-t|:-T":"smileys/time-out.png"
-"(~)|(wo)":"smileys/weather-overcast.png"
-"(wfc)":"smileys/weather-few-clouds.png"
-"(wc)":"smileys/weather-clear.png"
-"(wcn)":"smileys/weather-clear-night.png"
-"(wfcn)":"smileys/weather-few-clouds-night.png"
-"(wsa)":"smileys/weather-severe-alert.png"
-"(wss)":"smileys/weather-showers-scattered.png"
-"(wsnow)":"smileys/weather-snow.png"
-"(li)":"smileys/weather-storm.png"
-"(st)|(ws)":"smileys/weather-showers.png"
-}
diff --git a/retroshare-gui/src/gui/smileys/excited.png b/retroshare-gui/src/gui/smileys/excited.png
deleted file mode 100644
index ce3f8664b..000000000
Binary files a/retroshare-gui/src/gui/smileys/excited.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/excruciating.png b/retroshare-gui/src/gui/smileys/excruciating.png
deleted file mode 100644
index 1e7fec34e..000000000
Binary files a/retroshare-gui/src/gui/smileys/excruciating.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/eyeroll.png b/retroshare-gui/src/gui/smileys/eyeroll.png
deleted file mode 100644
index 0d8f021c2..000000000
Binary files a/retroshare-gui/src/gui/smileys/eyeroll.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/face-devil-grin48.png b/retroshare-gui/src/gui/smileys/face-devil-grin48.png
deleted file mode 100644
index a3d5d4eef..000000000
Binary files a/retroshare-gui/src/gui/smileys/face-devil-grin48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/female-fighter.png b/retroshare-gui/src/gui/smileys/female-fighter.png
deleted file mode 100644
index 188bd1bc5..000000000
Binary files a/retroshare-gui/src/gui/smileys/female-fighter.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/film.png b/retroshare-gui/src/gui/smileys/film.png
deleted file mode 100644
index 66acb127c..000000000
Binary files a/retroshare-gui/src/gui/smileys/film.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/fingers-crossed.png b/retroshare-gui/src/gui/smileys/fingers-crossed.png
deleted file mode 100644
index 33576ff10..000000000
Binary files a/retroshare-gui/src/gui/smileys/fingers-crossed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/flag.png b/retroshare-gui/src/gui/smileys/flag.png
deleted file mode 100644
index aff86374b..000000000
Binary files a/retroshare-gui/src/gui/smileys/flag.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/foot-in-mouth.png b/retroshare-gui/src/gui/smileys/foot-in-mouth.png
deleted file mode 100644
index 79aaa149b..000000000
Binary files a/retroshare-gui/src/gui/smileys/foot-in-mouth.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/freaked-out.png b/retroshare-gui/src/gui/smileys/freaked-out.png
deleted file mode 100644
index 85ca5717c..000000000
Binary files a/retroshare-gui/src/gui/smileys/freaked-out.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/ghost.png b/retroshare-gui/src/gui/smileys/ghost.png
deleted file mode 100644
index a58efa52f..000000000
Binary files a/retroshare-gui/src/gui/smileys/ghost.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/giggle.png b/retroshare-gui/src/gui/smileys/giggle.png
deleted file mode 100644
index 906fb4ae4..000000000
Binary files a/retroshare-gui/src/gui/smileys/giggle.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/girl.png b/retroshare-gui/src/gui/smileys/girl.png
deleted file mode 100644
index 82c942820..000000000
Binary files a/retroshare-gui/src/gui/smileys/girl.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/glasses-cool.png b/retroshare-gui/src/gui/smileys/glasses-cool.png
deleted file mode 100644
index 855bc4916..000000000
Binary files a/retroshare-gui/src/gui/smileys/glasses-cool.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/glasses-nerdy.png b/retroshare-gui/src/gui/smileys/glasses-nerdy.png
deleted file mode 100644
index 3d794b2ad..000000000
Binary files a/retroshare-gui/src/gui/smileys/glasses-nerdy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/go-away.png b/retroshare-gui/src/gui/smileys/go-away.png
deleted file mode 100644
index 24611ed0a..000000000
Binary files a/retroshare-gui/src/gui/smileys/go-away.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/goat.png b/retroshare-gui/src/gui/smileys/goat.png
deleted file mode 100644
index f44db4a4b..000000000
Binary files a/retroshare-gui/src/gui/smileys/goat.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/good.png b/retroshare-gui/src/gui/smileys/good.png
deleted file mode 100644
index c32988d22..000000000
Binary files a/retroshare-gui/src/gui/smileys/good.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hammer.png b/retroshare-gui/src/gui/smileys/hammer.png
deleted file mode 100644
index 53098ac0b..000000000
Binary files a/retroshare-gui/src/gui/smileys/hammer.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/handcuffs.png b/retroshare-gui/src/gui/smileys/handcuffs.png
deleted file mode 100644
index 849ee912d..000000000
Binary files a/retroshare-gui/src/gui/smileys/handcuffs.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/handshake.png b/retroshare-gui/src/gui/smileys/handshake.png
deleted file mode 100644
index a51da2d54..000000000
Binary files a/retroshare-gui/src/gui/smileys/handshake.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/happy.png b/retroshare-gui/src/gui/smileys/happy.png
deleted file mode 100644
index 8a2ba4925..000000000
Binary files a/retroshare-gui/src/gui/smileys/happy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/highfive.png b/retroshare-gui/src/gui/smileys/highfive.png
deleted file mode 100644
index 01a715985..000000000
Binary files a/retroshare-gui/src/gui/smileys/highfive.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hot.png b/retroshare-gui/src/gui/smileys/hot.png
deleted file mode 100644
index 1b7fbec14..000000000
Binary files a/retroshare-gui/src/gui/smileys/hot.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hug-left.png b/retroshare-gui/src/gui/smileys/hug-left.png
deleted file mode 100644
index fba82606d..000000000
Binary files a/retroshare-gui/src/gui/smileys/hug-left.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hug-right.png b/retroshare-gui/src/gui/smileys/hug-right.png
deleted file mode 100644
index 6cd79205d..000000000
Binary files a/retroshare-gui/src/gui/smileys/hug-right.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hungry.png b/retroshare-gui/src/gui/smileys/hungry.png
deleted file mode 100644
index 393482f13..000000000
Binary files a/retroshare-gui/src/gui/smileys/hungry.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/hypnotized.png b/retroshare-gui/src/gui/smileys/hypnotized.png
deleted file mode 100644
index 7b7488f49..000000000
Binary files a/retroshare-gui/src/gui/smileys/hypnotized.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/in-love.png b/retroshare-gui/src/gui/smileys/in-love.png
deleted file mode 100644
index 31aeea275..000000000
Binary files a/retroshare-gui/src/gui/smileys/in-love.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/island.png b/retroshare-gui/src/gui/smileys/island.png
deleted file mode 100644
index 5e63e1dc3..000000000
Binary files a/retroshare-gui/src/gui/smileys/island.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/jump.png b/retroshare-gui/src/gui/smileys/jump.png
deleted file mode 100644
index d476c556f..000000000
Binary files a/retroshare-gui/src/gui/smileys/jump.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/kiss.png b/retroshare-gui/src/gui/smileys/kiss.png
deleted file mode 100644
index 697392fd9..000000000
Binary files a/retroshare-gui/src/gui/smileys/kiss.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/kissed.png b/retroshare-gui/src/gui/smileys/kissed.png
deleted file mode 100644
index 7049c4819..000000000
Binary files a/retroshare-gui/src/gui/smileys/kissed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/kissing.png b/retroshare-gui/src/gui/smileys/kissing.png
deleted file mode 100644
index 31f8da999..000000000
Binary files a/retroshare-gui/src/gui/smileys/kissing.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/knife.png b/retroshare-gui/src/gui/smileys/knife.png
deleted file mode 100644
index 6db80de15..000000000
Binary files a/retroshare-gui/src/gui/smileys/knife.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/lamp.png b/retroshare-gui/src/gui/smileys/lamp.png
deleted file mode 100644
index 85b7968aa..000000000
Binary files a/retroshare-gui/src/gui/smileys/lamp.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/lashes.png b/retroshare-gui/src/gui/smileys/lashes.png
deleted file mode 100644
index 062d964d5..000000000
Binary files a/retroshare-gui/src/gui/smileys/lashes.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/laugh.png b/retroshare-gui/src/gui/smileys/laugh.png
deleted file mode 100644
index 306b2c592..000000000
Binary files a/retroshare-gui/src/gui/smileys/laugh.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/liquor.png b/retroshare-gui/src/gui/smileys/liquor.png
deleted file mode 100644
index cd509c9f0..000000000
Binary files a/retroshare-gui/src/gui/smileys/liquor.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/lol.png b/retroshare-gui/src/gui/smileys/lol.png
deleted file mode 100644
index 74938a7e5..000000000
Binary files a/retroshare-gui/src/gui/smileys/lol.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/loser.png b/retroshare-gui/src/gui/smileys/loser.png
deleted file mode 100644
index 0cecd2fce..000000000
Binary files a/retroshare-gui/src/gui/smileys/loser.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/love-over.png b/retroshare-gui/src/gui/smileys/love-over.png
deleted file mode 100644
index 59c8a6ef6..000000000
Binary files a/retroshare-gui/src/gui/smileys/love-over.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/love.png b/retroshare-gui/src/gui/smileys/love.png
deleted file mode 100644
index 5171deed6..000000000
Binary files a/retroshare-gui/src/gui/smileys/love.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/lying.png b/retroshare-gui/src/gui/smileys/lying.png
deleted file mode 100644
index c7e8be338..000000000
Binary files a/retroshare-gui/src/gui/smileys/lying.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mad-tongue.png b/retroshare-gui/src/gui/smileys/mad-tongue.png
deleted file mode 100644
index 14cfd37c1..000000000
Binary files a/retroshare-gui/src/gui/smileys/mad-tongue.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mail.png b/retroshare-gui/src/gui/smileys/mail.png
deleted file mode 100644
index a1a365f0d..000000000
Binary files a/retroshare-gui/src/gui/smileys/mail.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/male-fighter1.png b/retroshare-gui/src/gui/smileys/male-fighter1.png
deleted file mode 100644
index e3a4b1790..000000000
Binary files a/retroshare-gui/src/gui/smileys/male-fighter1.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/male-fighter2.png b/retroshare-gui/src/gui/smileys/male-fighter2.png
deleted file mode 100644
index 5feb9dd7c..000000000
Binary files a/retroshare-gui/src/gui/smileys/male-fighter2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mean.png b/retroshare-gui/src/gui/smileys/mean.png
deleted file mode 100644
index ac05d2128..000000000
Binary files a/retroshare-gui/src/gui/smileys/mean.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/meeting.png b/retroshare-gui/src/gui/smileys/meeting.png
deleted file mode 100644
index 02b4b1a67..000000000
Binary files a/retroshare-gui/src/gui/smileys/meeting.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/messed.png b/retroshare-gui/src/gui/smileys/messed.png
deleted file mode 100644
index f76307f63..000000000
Binary files a/retroshare-gui/src/gui/smileys/messed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mobile.png b/retroshare-gui/src/gui/smileys/mobile.png
deleted file mode 100644
index ac3469007..000000000
Binary files a/retroshare-gui/src/gui/smileys/mobile.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mohawk.png b/retroshare-gui/src/gui/smileys/mohawk.png
deleted file mode 100644
index 60a9f0ffb..000000000
Binary files a/retroshare-gui/src/gui/smileys/mohawk.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/moneymouth.png b/retroshare-gui/src/gui/smileys/moneymouth.png
deleted file mode 100644
index 8fe1fa470..000000000
Binary files a/retroshare-gui/src/gui/smileys/moneymouth.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/monkey.png b/retroshare-gui/src/gui/smileys/monkey.png
deleted file mode 100644
index dfc05f5b3..000000000
Binary files a/retroshare-gui/src/gui/smileys/monkey.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/moon.png b/retroshare-gui/src/gui/smileys/moon.png
deleted file mode 100644
index 0679d3dec..000000000
Binary files a/retroshare-gui/src/gui/smileys/moon.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/mrgreen.png b/retroshare-gui/src/gui/smileys/mrgreen.png
deleted file mode 100644
index eda7038bb..000000000
Binary files a/retroshare-gui/src/gui/smileys/mrgreen.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/music.png b/retroshare-gui/src/gui/smileys/music.png
deleted file mode 100644
index e9d87e1fe..000000000
Binary files a/retroshare-gui/src/gui/smileys/music.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/musical-note.png b/retroshare-gui/src/gui/smileys/musical-note.png
deleted file mode 100644
index d003bc617..000000000
Binary files a/retroshare-gui/src/gui/smileys/musical-note.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/nervous.png b/retroshare-gui/src/gui/smileys/nervous.png
deleted file mode 100644
index 6888af8e0..000000000
Binary files a/retroshare-gui/src/gui/smileys/nervous.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/neutral.png b/retroshare-gui/src/gui/smileys/neutral.png
deleted file mode 100644
index 00691ac1e..000000000
Binary files a/retroshare-gui/src/gui/smileys/neutral.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/on-the-phone.png b/retroshare-gui/src/gui/smileys/on-the-phone.png
deleted file mode 100644
index dd8155994..000000000
Binary files a/retroshare-gui/src/gui/smileys/on-the-phone.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/party.png b/retroshare-gui/src/gui/smileys/party.png
deleted file mode 100644
index 66828bd96..000000000
Binary files a/retroshare-gui/src/gui/smileys/party.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/peace.png b/retroshare-gui/src/gui/smileys/peace.png
deleted file mode 100644
index ffeab9d95..000000000
Binary files a/retroshare-gui/src/gui/smileys/peace.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/phone.png b/retroshare-gui/src/gui/smileys/phone.png
deleted file mode 100644
index a3c86155c..000000000
Binary files a/retroshare-gui/src/gui/smileys/phone.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pig.png b/retroshare-gui/src/gui/smileys/pig.png
deleted file mode 100644
index 1dc5c1ff7..000000000
Binary files a/retroshare-gui/src/gui/smileys/pig.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pill.png b/retroshare-gui/src/gui/smileys/pill.png
deleted file mode 100644
index 04d326a2b..000000000
Binary files a/retroshare-gui/src/gui/smileys/pill.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pirate.png b/retroshare-gui/src/gui/smileys/pirate.png
deleted file mode 100644
index ff807af9a..000000000
Binary files a/retroshare-gui/src/gui/smileys/pirate.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pissed-off.png b/retroshare-gui/src/gui/smileys/pissed-off.png
deleted file mode 100644
index 224021002..000000000
Binary files a/retroshare-gui/src/gui/smileys/pissed-off.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pizza.png b/retroshare-gui/src/gui/smileys/pizza.png
deleted file mode 100644
index 9b8da769b..000000000
Binary files a/retroshare-gui/src/gui/smileys/pizza.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/plate.png b/retroshare-gui/src/gui/smileys/plate.png
deleted file mode 100644
index 0ed2c6fdb..000000000
Binary files a/retroshare-gui/src/gui/smileys/plate.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/poop.png b/retroshare-gui/src/gui/smileys/poop.png
deleted file mode 100644
index 3413bbaff..000000000
Binary files a/retroshare-gui/src/gui/smileys/poop.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pouty.png b/retroshare-gui/src/gui/smileys/pouty.png
deleted file mode 100644
index dc113eac5..000000000
Binary files a/retroshare-gui/src/gui/smileys/pouty.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pray.png b/retroshare-gui/src/gui/smileys/pray.png
deleted file mode 100644
index a7815aed9..000000000
Binary files a/retroshare-gui/src/gui/smileys/pray.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/present.png b/retroshare-gui/src/gui/smileys/present.png
deleted file mode 100644
index ac43e38db..000000000
Binary files a/retroshare-gui/src/gui/smileys/present.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/pumpkin.png b/retroshare-gui/src/gui/smileys/pumpkin.png
deleted file mode 100644
index 389c2b0c8..000000000
Binary files a/retroshare-gui/src/gui/smileys/pumpkin.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/qq.png b/retroshare-gui/src/gui/smileys/qq.png
deleted file mode 100644
index cf5a02a92..000000000
Binary files a/retroshare-gui/src/gui/smileys/qq.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/question.png b/retroshare-gui/src/gui/smileys/question.png
deleted file mode 100644
index c4bc2e104..000000000
Binary files a/retroshare-gui/src/gui/smileys/question.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/quiet.png b/retroshare-gui/src/gui/smileys/quiet.png
deleted file mode 100644
index 371574fa4..000000000
Binary files a/retroshare-gui/src/gui/smileys/quiet.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/rain.png b/retroshare-gui/src/gui/smileys/rain.png
deleted file mode 100644
index 6954d826a..000000000
Binary files a/retroshare-gui/src/gui/smileys/rain.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/rainbow.png b/retroshare-gui/src/gui/smileys/rainbow.png
deleted file mode 100644
index 344fdb5dc..000000000
Binary files a/retroshare-gui/src/gui/smileys/rainbow.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/rose-dead.png b/retroshare-gui/src/gui/smileys/rose-dead.png
deleted file mode 100644
index 927cf90eb..000000000
Binary files a/retroshare-gui/src/gui/smileys/rose-dead.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/rose.png b/retroshare-gui/src/gui/smileys/rose.png
deleted file mode 100644
index 33cfb1378..000000000
Binary files a/retroshare-gui/src/gui/smileys/rose.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/rotfl.png b/retroshare-gui/src/gui/smileys/rotfl.png
deleted file mode 100644
index f0c4879ef..000000000
Binary files a/retroshare-gui/src/gui/smileys/rotfl.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sad.png b/retroshare-gui/src/gui/smileys/sad.png
deleted file mode 100644
index bf20e9df8..000000000
Binary files a/retroshare-gui/src/gui/smileys/sad.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sarcastic.png b/retroshare-gui/src/gui/smileys/sarcastic.png
deleted file mode 100644
index eef0e8e96..000000000
Binary files a/retroshare-gui/src/gui/smileys/sarcastic.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/search.png b/retroshare-gui/src/gui/smileys/search.png
deleted file mode 100644
index d61cebb36..000000000
Binary files a/retroshare-gui/src/gui/smileys/search.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/secret.png b/retroshare-gui/src/gui/smileys/secret.png
deleted file mode 100644
index 64fc95ef3..000000000
Binary files a/retroshare-gui/src/gui/smileys/secret.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/shame.png b/retroshare-gui/src/gui/smileys/shame.png
deleted file mode 100644
index a4b054798..000000000
Binary files a/retroshare-gui/src/gui/smileys/shame.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sheep.png b/retroshare-gui/src/gui/smileys/sheep.png
deleted file mode 100644
index dc3feaa45..000000000
Binary files a/retroshare-gui/src/gui/smileys/sheep.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/shocked.png b/retroshare-gui/src/gui/smileys/shocked.png
deleted file mode 100644
index 0e7438e9e..000000000
Binary files a/retroshare-gui/src/gui/smileys/shocked.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/shout.png b/retroshare-gui/src/gui/smileys/shout.png
deleted file mode 100644
index 1fe2fa9db..000000000
Binary files a/retroshare-gui/src/gui/smileys/shout.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/shut-mouth.png b/retroshare-gui/src/gui/smileys/shut-mouth.png
deleted file mode 100644
index 5037ad681..000000000
Binary files a/retroshare-gui/src/gui/smileys/shut-mouth.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sick.png b/retroshare-gui/src/gui/smileys/sick.png
deleted file mode 100644
index 94e4e598c..000000000
Binary files a/retroshare-gui/src/gui/smileys/sick.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sidefrown.png b/retroshare-gui/src/gui/smileys/sidefrown.png
deleted file mode 100644
index 2d4e42206..000000000
Binary files a/retroshare-gui/src/gui/smileys/sidefrown.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/silly.png b/retroshare-gui/src/gui/smileys/silly.png
deleted file mode 100644
index 950400c1b..000000000
Binary files a/retroshare-gui/src/gui/smileys/silly.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sinister.png b/retroshare-gui/src/gui/smileys/sinister.png
deleted file mode 100644
index f26a3a617..000000000
Binary files a/retroshare-gui/src/gui/smileys/sinister.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/skeleton.png b/retroshare-gui/src/gui/smileys/skeleton.png
deleted file mode 100644
index f59540d58..000000000
Binary files a/retroshare-gui/src/gui/smileys/skeleton.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/skywalker.png b/retroshare-gui/src/gui/smileys/skywalker.png
deleted file mode 100644
index d6365f1e5..000000000
Binary files a/retroshare-gui/src/gui/smileys/skywalker.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sleeping.png b/retroshare-gui/src/gui/smileys/sleeping.png
deleted file mode 100644
index e3bfe411b..000000000
Binary files a/retroshare-gui/src/gui/smileys/sleeping.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sleepy.png b/retroshare-gui/src/gui/smileys/sleepy.png
deleted file mode 100644
index 2c3e78fd8..000000000
Binary files a/retroshare-gui/src/gui/smileys/sleepy.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/smile.png b/retroshare-gui/src/gui/smileys/smile.png
deleted file mode 100644
index a113e35cf..000000000
Binary files a/retroshare-gui/src/gui/smileys/smile.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/smirk.png b/retroshare-gui/src/gui/smileys/smirk.png
deleted file mode 100644
index c458e1a60..000000000
Binary files a/retroshare-gui/src/gui/smileys/smirk.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/snail.png b/retroshare-gui/src/gui/smileys/snail.png
deleted file mode 100644
index 2e8ac91ba..000000000
Binary files a/retroshare-gui/src/gui/smileys/snail.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/snicker.png b/retroshare-gui/src/gui/smileys/snicker.png
deleted file mode 100644
index a40c46261..000000000
Binary files a/retroshare-gui/src/gui/smileys/snicker.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/snowman.png b/retroshare-gui/src/gui/smileys/snowman.png
deleted file mode 100644
index 9fec7d7d5..000000000
Binary files a/retroshare-gui/src/gui/smileys/snowman.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/soccerball.png b/retroshare-gui/src/gui/smileys/soccerball.png
deleted file mode 100644
index 358a157b3..000000000
Binary files a/retroshare-gui/src/gui/smileys/soccerball.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/soldier.png b/retroshare-gui/src/gui/smileys/soldier.png
deleted file mode 100644
index 04435a9e3..000000000
Binary files a/retroshare-gui/src/gui/smileys/soldier.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/star.png b/retroshare-gui/src/gui/smileys/star.png
deleted file mode 100644
index cc92a69a7..000000000
Binary files a/retroshare-gui/src/gui/smileys/star.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/starving.png b/retroshare-gui/src/gui/smileys/starving.png
deleted file mode 100644
index 4eb3b62d5..000000000
Binary files a/retroshare-gui/src/gui/smileys/starving.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/stop.png b/retroshare-gui/src/gui/smileys/stop.png
deleted file mode 100644
index 469eaa0e8..000000000
Binary files a/retroshare-gui/src/gui/smileys/stop.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/stressed.png b/retroshare-gui/src/gui/smileys/stressed.png
deleted file mode 100644
index 8168455af..000000000
Binary files a/retroshare-gui/src/gui/smileys/stressed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/struggle.png b/retroshare-gui/src/gui/smileys/struggle.png
deleted file mode 100644
index f3fc010d7..000000000
Binary files a/retroshare-gui/src/gui/smileys/struggle.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/sun.png b/retroshare-gui/src/gui/smileys/sun.png
deleted file mode 100644
index 43a61280c..000000000
Binary files a/retroshare-gui/src/gui/smileys/sun.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/surprised.png b/retroshare-gui/src/gui/smileys/surprised.png
deleted file mode 100644
index 19a7b33a9..000000000
Binary files a/retroshare-gui/src/gui/smileys/surprised.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/talktohand.png b/retroshare-gui/src/gui/smileys/talktohand.png
deleted file mode 100644
index 721895515..000000000
Binary files a/retroshare-gui/src/gui/smileys/talktohand.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/teeth.png b/retroshare-gui/src/gui/smileys/teeth.png
deleted file mode 100644
index 42ae1d558..000000000
Binary files a/retroshare-gui/src/gui/smileys/teeth.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/terror.png b/retroshare-gui/src/gui/smileys/terror.png
deleted file mode 100644
index 91c07d660..000000000
Binary files a/retroshare-gui/src/gui/smileys/terror.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/theme b/retroshare-gui/src/gui/smileys/theme
deleted file mode 100644
index 887d11da5..000000000
--- a/retroshare-gui/src/gui/smileys/theme
+++ /dev/null
@@ -1,497 +0,0 @@
-Name=Default
-Description=Pidgin smileys
-Icon=wink.png
-Author=Hylke Bons
-
-
-# Default smileys
-[default]
-happy.png           :)      :-)
-excited.png         :-D     :-d     :D      :d
-sad.png             :-(     :(
-wink.png            ;-)     ;)
-tongue.png          :P      :p      :-P     :-p
-shocked.png         =-O     =-o
-kiss.png            :-*
-glasses-cool.png    8-)
-embarrassed.png     :-[
-crying.png          :'(     :'-(
-thinking.png        :-/     :-\\
-angel.png           O:-)    o:-)
-shut-mouth.png      :-X
-moneymouth.png      :-$
-foot-in-mouth.png   :-!
-shout.png           >:o     >:O
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-[XMPP]
-# Following XEP-0038 + GTalk + our default set, in default set order
-# The GTalk strings come from ticket #3307.
-happy.png           :)      :-)     =)
-excited.png         :-D     :-d     :D      :d      =D      =d
-sad.png             :-(     :(
-wink.png            ;-)     ;)      ;^)
-tongue.png          :P      :p      :-P     :-p
-shocked.png         =-O     =-o     :-O     :-o
-kiss.png            :kiss:  :-*
-glasses-cool.png    8-)     B-)
-embarrassed.png     :-[
-crying.png          :'-(    :'(
-thinking.png        :-/     :-\\
-angel.png           O:-)    o:-)
-shut-mouth.png      :-X
-moneymouth.png      :-$
-foot-in-mouth.png   :-!
-shout.png           >:o     >:O
-
-# Following XEP-0038 + GTalk
-angry.png           >:-(    >:(     X-(    x-(
-good.png            :yes:
-bad.png             :no:
-stop.png            :wait:
-rose.png            @->--   :rose:
-phone.png           :telephone:
-mail.png            :email:
-lamp.png            :jabber:
-cake.png            :cake:
-in_love.png         :heart: :love:  <3
-love-over.png       :brokenheart:
-musical-note.png    :music:
-beer.png            :beer:
-coffee.png          :coffee:
-coins.png           :money:
-moon.png            :moon:
-sun.png             :sun:
-star.png            :star:
-
-# Others
-neutral.png         :|      :-|
-victory.png         \\m/
-
-# Hidden icons from the default set.
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-# Following AIM 6.1
-[AIM]
-happy.png           :-)     :)
-wink.png            ;-)     ;)
-sad.png             :-(     :(
-tongue.png          :P      :p      :-P     :-p
-shocked.png         =-O
-kiss.png            :-*
-shout.png           >:o
-excited.png         :-D     :D
-moneymouth.png      :-$
-foot-in-mouth.png   :-!
-embarrassed.png     :-[
-angel.png           O:-)
-thinking.png        :-\\    :-/
-crying.png          :'(
-shut-mouth.png      :-X
-glasses-cool.png    8-)
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-# Following Windows Live Messenger 8.1
-[MSN]
-happy.png           :)      :-)
-excited.png         :D      :d      :-D     :-d
-wink.png            ;)      ;-)
-shocked.png         :-O     :-o     :O      :o
-tongue.png          :-P     :P      :-p     :p
-glasses-cool.png    (H)     (h)
-angry.png           :@      :-@
-embarrassed.png     :$      :-$
-confused.png        :S      :s      :-S     :-s
-sad.png             :(      :-(
-crying.png          :'(
-neutral.png         :|      :-|
-devil.png           (6)
-angel.png           (A)     (a)
-in_love.png         (L)     (l)
-love-over.png       (U)     (u)
-msn.png             (M)     (m)
-cat.png             (@)
-dog.png             (&)
-moon.png            (S)
-star.png            (*)
-film.png            (~)
-musical-note.png    (8)
-mail.png            (E)     (e)
-rose.png            (F)     (f)
-rose-dead.png       (W)     (w)
-clock.png           (O)     (o)
-kiss.png            (K)     (k)
-present.png         (G)     (g)
-cake.png            (^)
-camera.png          (P)     (p)
-lamp.png            (I)     (i)
-coffee.png          (C)     (c)
-phone.png           (T)     (t)
-hug-left.png        ({)
-hug-right.png       (})
-beer.png            (B)     (b)
-drink.png           (D)     (d)
-boy.png             (Z)     (z)
-girl.png            (X)     (x)
-good.png            (Y)     (y)
-bad.png             (N)     (n)
-vampire.png         :[      :-[
-goat.png            (nah)
-sun.png             (#)
-rainbow.png         (R)     (r)
-quiet.png           :-#
-teeth.png           8o|
-glasses-nerdy.png   8-|
-sarcastic.png       ^o)
-secret.png          :-*
-sick.png            +o(
-snail.png           (sn)
-turtle.png          (tu)
-plate.png           (pl)
-bowl.png            (||)
-pizza.png           (pi)
-soccerball.png      (so)
-car.png             (au)
-airplane.png        (ap)
-umbrella.png        (um)
-island.png          (ip)
-computer.png        (co)
-mobile.png          (mp)
-brb.png             (brb)
-rain.png            (st)
-highfive.png        (h5)
-coins.png           (mo)
-sheep.png           (bah)
-dont-know.png       :^)
-thinking.png        *-)
-thunder.png         (li)
-party.png           <:o)
-eyeroll.png         8-)
-sleepy.png          |-) 
-bunny.png           ('.')
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-# Hidden MSN emotes
-cigarette.png      	(ci)    (CI)
-handcuffs.png       (%)
-console.png			(xx)    (XX)
-fingers-crossed.png	(yn)    (YN)
-
-
-# Following QQ 2006
-[QQ]
-shocked.png         /:O      /jy       /surprised
-curl-lip.png        /:~      /pz       /curl_lip
-desire.png          /:*      /se       /desire
-dazed.png           /:|      /dazed
-party.png           /8-)     /dy       /revel
-crying.png          /:<      /ll       /cry
-bashful.png         /:$      /hx       /bashful
-shut-mouth.png      /:X      /bz       /shut_mouth
-sleeping.png        /:Z      /shui     /sleep
-weep.png            /:'(     /dk       /weep
-embarrassed.png     /:-|     /gg       /embarassed
-pissed-off.png      /:@      /fn       /pissed_off
-act-up.png          /:P      /tp       /act_up
-excited.png         /:D      /cy       /toothy_smile
-happy.png           /:)      /wx       /small_smile
-sad.png             /:(      /ng       /sad
-glasses-cool.png    /:+      /kuk      /cool
-doctor.png          /:#      /feid     /SARS
-silly.png           /:Q      /zk       /crazy
-sick.png            /:T      /tu       /vomit
-snicker.png         /;p      /tx       /titter
-cute.png            /;-D     /ka       /cute
-disdain.png         /;d      /by       /disdain
-arrogant.png        /;o      /am       /arrogant
-starving.png        /:g      /jie      /starving
-sleepy.png          /|-)     /kun      /sleepy
-terror.png          /:!      /jk       /terror
-hot.png             /:L      /sweat
-smirk.png           /:>      /hanx     /smirk
-soldier.png         /:;      /db       /soldier
-struggle.png        /;f      /fendou   /struggle
-curse.png           /:-S     /zhm      /curse
-question.png        /?       /yiw      /question
-quiet.png           /;x      /xu       /shh
-hypnotized.png      /;@      /yun      /dizzy
-excruciating.png    /:8      /zhem     /excrutiating
-freaked-out.png     /;!      /shuai    /freaked_out
-skeleton.png        /!!!     /kl       /skeleton
-hammer.png          /xx      /qiao     /hammer
-bye.png             /bye     /zj       /bye
-go-away.png         /go      /shan     /go
-afraid.png          /shake   /fad      /shake
-amorous.png         /love    /aiq      /love
-jump.png            /jump    /tiao     /jump
-search.png          /find    /zhao     /search
-lashes.png          /&       /mm       /beautiful_eyebrows
-pig.png             /pig     /zt       /pig
-cat.png             /cat     /mm       /cat
-dog.png             /dog     /xg       /dog
-hug-left.png        /hug     /yb       /hug
-coins.png           /$       /qianc    /money
-lamp.png            /!       /dp       /lightbulb
-bowl.png            /cup     /bei      /cup
-cake.png            /cake    /dg       /cake
-thunder.png         /li      /shd      /lightning
-bomb.png            /bome    /zhd      /bomb
-knife.png           /kn      /dao      /knife
-soccerball.png      /footb   /zq       /soccer
-musical-note.png    /music   /yy       /music
-poop.png            /shit    /bb       /shit
-coffee.png          /coffee  /kf       /coffee
-hungry.png          /eat     /fan      /eat
-pill.png            /pill    /yw       /pill
-rose.png            /rose    /mg       /rose
-wilt.png            /fade    /dx       /wilt
-kiss.png            /kiss    /wen      /kiss
-in_love.png         /heart   /xin      /heart
-love-over.png       /break   /xs       /broken_heart
-meeting.png         /meeting /hy       /meeting
-present.png         /gift    /lw       /gift
-phone.png           /phone   /dh       /phone
-clock.png           /time    /sj       /time
-mail.png            /email   /yj       /email
-tv.png              /TV      /ds       /TV
-sun.png             /sun     /ty       /sun
-moon.png            /moon    /yl       /moon
-good.png            /strong  /qiang    /thumbs_up
-bad.png             /weak    /ruo      /thumbs_down
-handshake.png       /share   /ws       /handshake
-victory.png         /v       /shl      /victory
-beauty.png          /<J>     /mn       /beauty
-qq.png              /<QQ>    /qz       /qq
-blowkiss.png        /<L>     /fw       /blow_kiss
-angry.png           /<O>     /oh       /angry
-liquor.png          /<B>     /bj       /baijiu
-can.png             /<U>     /qsh      /soda
-watermelon.png      /<W>     /xigua    /watermelon
-rain.png            /<!!>    /xy       /rain
-cloudy.png          /<~>     /duoy     /cloudy
-snowman.png         /<Z>     /xr       /snowman
-star.png            /<*>     /xixing   /star
-girl.png            /<00>    /nv       /woman
-boy.png             /<11>    /nan      /man
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-# Following ICQ 6.0
-[ICQ]
-happy.png           :-)     :)
-neutral.png         :-$
-sad.png             :-(     :(
-shocked.png         =-O
-wink.png            ;-)     ;)
-tongue.png          :-P     :P      :-p     :p
-music.png           [:-}
-laugh.png           *JOKINGLY*
-sleeping.png        *TIRED*
-crying.png          :'(    :'-(
-sick.png            :-!
-kissed.png          *KISSED*
-stop.png            *STOP*
-kiss.png            :-{} :-*
-kissing.png         *KISSING* 
-victory.png         *YAHOO*
-silly.png           %)
-embarrassed.png     :-[
-devil.png           ]:->
-angel.png           O:-)
-rose.png            @}->--
-shut-mouth.png      :-X     :X      :-x     :x
-bomb.png            @=
-thinking.png        :-\\    :-/
-good.png            *THUMBS\ UP*
-shout.png           >:o     >:O     :-@
-beer.png            *DRINK*
-excited.png         :-D     :D
-glasses-cool.png    8-)
-amorous.png         *IN\ LOVE*
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-# Following Yahoo! Messenger 8.1
-[Yahoo]
-happy.png           :)      :-)
-question.png        :-/     :-\\
-shocked.png         :-O     :O      :-o     :o 
-devil.png           >:)
-angel.png           O:-)    o:-)    0:-)
-sick.png            :-&
-sleepy.png          (:|
-hypnotized.png      @-)
-on-the-phone.png    :)]
-sad.png             :(      :-(
-amorous.png         :x      :-x     :X      :-X
-angry.png           X-(     x-(     X(      x(
-crying.png          :((
-glasses-nerdy.png   :-B     :-b
-quiet.png           :-$
-drool.png           =P~     =p~
-lying.png           :^O     :^o
-call-me.png         :-c
-wink.png            ;)      ;-)
-embarrassed.png     :">
-mean.png            :->     :>
-laugh.png           :))     :-))
-bye.png             =;
-arrogant.png        [-(
-thinking.png        :-?
-waiting.png         :-w     :-W
-at-wits-end.png     ~x(     ~X(
-excited.png         :D      :-D     :d      :-d
-tongue.png          :-P     :P      :-p     :p
-glasses-cool.png    B-)     b-)
-neutral.png         :|      :-|
-sleeping.png        I-)     i-)     |-)
-clown.png           :o)     :O)
-doh.png             #-o     #-O
-weep.png            :-<
-go-away.png         :-h
-lashes.png          ;;)
-kiss.png            :-*     :*
-confused.png        :-S     :-s
-sarcastic.png       /:)
-eyeroll.png         8-|
-silly.png           8-}
-clap.png            =D>     =d>
-mad-tongue.png      >:P     >:p
-time-out.png        :-t     :-T
-hug-left.png        >:D<    >:d<
-love-over.png       =((
-hot.png             #:-S    #:-s
-rotfl.png           =)) :-j :-J 
-loser.png           L-)     l-)
-party.png           <:-P    <:-p
-nervous.png         :-SS	:-Ss	:-sS	:-ss
-cowboy.png          <):)
-desire.png          8->
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-# Hidden Yahoo emotes
-alien.png           =:)     >-)
-beat-up.png         b-(     B-(
-chicken.png         ~:>
-coffee.png          ~o)     ~O)
-cow.png             3:-O    3:-o
-dance.png           \\:D/   \\:d/
-rose.png            @};-
-dont-know.png       :-L     :-l
-skeleton.png        8-X     8-x
-lamp.png            *-:)
-monkey.png          :(|)
-coins.png           $-)
-peace.png           :)>-
-pig.png             :@)
-pray.png            [-o<    [-O<
-pumpkin.png         (~~)
-shame.png           [-X     [-x
-flag.png            **==
-clover.png          %%-
-musical-note.png    :-"
-giggle.png          ;))
-worship.png         ^:)^
-star.png            (*)
-waving.png          >:/
-talktohand.png      :-@
-
-# Only available after activating the Yahoo! Fighter IMVironment
-male-fighter1.png   o->     O->
-male-fighter2.png   o=>     O=>
-female-fighter.png  o-+     O-+
-yin-yang.png        (%)
-
-
-# Following MySpaceIM Beta 1.0.697.0
-[MySpaceIM]
-excited.png  	    :D      :-D
-devil.png	    }:)
-confused.png	    :Z
-glasses-nerdy.png   B)
-bulgy-eyes.png	    %)
-freaked-out.png	    :E
-smile.png	    :)      :-)
-amorous.png	    :X
-laugh.png	    :))
-mohawk.png	    -:
-mad-tongue.png	    X(
-messed.png	    X)
-glasses-nerdy.png   Q)
-doh.png		    :G
-pirate.png	    P)
-shocked.png	    :O
-sidefrown.png	    :{
-sinister.png	    :B
-smirk.png	    :,
-neutral.png	    :|
-tongue.png	    :P      :p
-pissed-off.png	    B|
-wink.png	    ;-)     ;)
-sad.png		    :[
-kiss.png            :x
-! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)   :(|)    8-|)
-! cyclops.png       O-)     o-)
-
-
-# MXit standard emoticons
-[MXit]
-happy.png           :-)     :)
-sad.png             :-(     :(
-wink.png            ;-)     ;)
-excited.png         :-D     :D     :->      :>
-neutral.png         :-|     :|
-shocked.png         :-O     :O
-tongue.png          :-P     :P
-embarrassed.png     :-$     :$
-glasses-cool.png    8-)
-in_love.png         (H)
-rose.png            (F)
-### Added in v3.0
-boy.png             (m)
-girl.png            (f)
-star.png            (*)
-chilli.png          (c)
-kiss.png            (x)
-lamp.png            (i)
-pissed-off.png      :e      :-e
-shut-mouth.png      :-x     :x
-thunder.png         (z)
-coffee.png          (U)
-mrgreen.png         (G)
-### Added in v5.0
-sick.png            :o(
-excruciating.png    :-{     :{
-amorous.png         :-}     :}
-eyeroll.png         8-o     8o
-crying.png          :'(
-thinking.png        :-?     :?
-drool.png           :-~     :~
-sleeping.png        :-z     :z
-lying.png           :L)
-glasses-nerdy.png   8-|     8|
-pirate.png          P-)
-### Added in v5.9.7
-bored.png           :-[     :[
-cold.png            :-<     :<
-confused.png        :-,     :,
-hungry.png          :-C     :C
-stressed.png        :-s     :s
diff --git a/retroshare-gui/src/gui/smileys/thinking.png b/retroshare-gui/src/gui/smileys/thinking.png
deleted file mode 100644
index 5567953a6..000000000
Binary files a/retroshare-gui/src/gui/smileys/thinking.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/thunder.png b/retroshare-gui/src/gui/smileys/thunder.png
deleted file mode 100644
index fef2007b8..000000000
Binary files a/retroshare-gui/src/gui/smileys/thunder.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/time-out.png b/retroshare-gui/src/gui/smileys/time-out.png
deleted file mode 100644
index 7b8ff4d62..000000000
Binary files a/retroshare-gui/src/gui/smileys/time-out.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/tongue.png b/retroshare-gui/src/gui/smileys/tongue.png
deleted file mode 100644
index 029f0a566..000000000
Binary files a/retroshare-gui/src/gui/smileys/tongue.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/turtle.png b/retroshare-gui/src/gui/smileys/turtle.png
deleted file mode 100644
index a95b64f03..000000000
Binary files a/retroshare-gui/src/gui/smileys/turtle.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/tv.png b/retroshare-gui/src/gui/smileys/tv.png
deleted file mode 100644
index 30b896986..000000000
Binary files a/retroshare-gui/src/gui/smileys/tv.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/umbrella.png b/retroshare-gui/src/gui/smileys/umbrella.png
deleted file mode 100644
index 8c5a8518f..000000000
Binary files a/retroshare-gui/src/gui/smileys/umbrella.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/vampire.png b/retroshare-gui/src/gui/smileys/vampire.png
deleted file mode 100644
index 6758b35aa..000000000
Binary files a/retroshare-gui/src/gui/smileys/vampire.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/victory.png b/retroshare-gui/src/gui/smileys/victory.png
deleted file mode 100644
index b35692fa1..000000000
Binary files a/retroshare-gui/src/gui/smileys/victory.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/waiting.png b/retroshare-gui/src/gui/smileys/waiting.png
deleted file mode 100644
index 0f6baeea7..000000000
Binary files a/retroshare-gui/src/gui/smileys/waiting.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/watermelon.png b/retroshare-gui/src/gui/smileys/watermelon.png
deleted file mode 100644
index 4a201d523..000000000
Binary files a/retroshare-gui/src/gui/smileys/watermelon.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/waving.png b/retroshare-gui/src/gui/smileys/waving.png
deleted file mode 100644
index e309c3e34..000000000
Binary files a/retroshare-gui/src/gui/smileys/waving.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-clear-night.png b/retroshare-gui/src/gui/smileys/weather-clear-night.png
deleted file mode 100644
index aa2714cbe..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-clear-night.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-clear.png b/retroshare-gui/src/gui/smileys/weather-clear.png
deleted file mode 100644
index c84e8d377..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-clear.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png b/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png
deleted file mode 100644
index 62e21d7ff..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-few-clouds.png b/retroshare-gui/src/gui/smileys/weather-few-clouds.png
deleted file mode 100644
index 8c14e0d71..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-few-clouds.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-overcast.png b/retroshare-gui/src/gui/smileys/weather-overcast.png
deleted file mode 100644
index cc22e4ce4..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-overcast.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-severe-alert.png b/retroshare-gui/src/gui/smileys/weather-severe-alert.png
deleted file mode 100644
index fb75808bb..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-severe-alert.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-showers-scattered.png b/retroshare-gui/src/gui/smileys/weather-showers-scattered.png
deleted file mode 100644
index 6e85a7bc9..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-showers-scattered.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-showers.png b/retroshare-gui/src/gui/smileys/weather-showers.png
deleted file mode 100644
index 00743484e..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-showers.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-snow.png b/retroshare-gui/src/gui/smileys/weather-snow.png
deleted file mode 100644
index fef6e4dde..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-snow.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weather-storm.png b/retroshare-gui/src/gui/smileys/weather-storm.png
deleted file mode 100644
index 8a7db962b..000000000
Binary files a/retroshare-gui/src/gui/smileys/weather-storm.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/weep.png b/retroshare-gui/src/gui/smileys/weep.png
deleted file mode 100644
index 85c87319f..000000000
Binary files a/retroshare-gui/src/gui/smileys/weep.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/wilt.png b/retroshare-gui/src/gui/smileys/wilt.png
deleted file mode 100644
index fd8912904..000000000
Binary files a/retroshare-gui/src/gui/smileys/wilt.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/wink.png b/retroshare-gui/src/gui/smileys/wink.png
deleted file mode 100644
index 6316618a9..000000000
Binary files a/retroshare-gui/src/gui/smileys/wink.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/worship.png b/retroshare-gui/src/gui/smileys/worship.png
deleted file mode 100644
index 2a3010df8..000000000
Binary files a/retroshare-gui/src/gui/smileys/worship.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/smileys/yin-yang.png b/retroshare-gui/src/gui/smileys/yin-yang.png
deleted file mode 100644
index 4d3f970a7..000000000
Binary files a/retroshare-gui/src/gui/smileys/yin-yang.png and /dev/null differ