diff --git a/smileys/Basic/MrSmith.png b/smileys/Basic/MrSmith.png
deleted file mode 100644
index 87a1480b0..000000000
Binary files a/smileys/Basic/MrSmith.png and /dev/null differ
diff --git a/smileys/Basic/X(.png b/smileys/Basic/X(.png
deleted file mode 100644
index 6e27695fd..000000000
Binary files a/smileys/Basic/X(.png and /dev/null differ
diff --git a/smileys/Basic/XD.png b/smileys/Basic/XD.png
deleted file mode 100644
index 75891d4fb..000000000
Binary files a/smileys/Basic/XD.png and /dev/null differ
diff --git a/smileys/Basic/XP.png b/smileys/Basic/XP.png
deleted file mode 100644
index db412a898..000000000
Binary files a/smileys/Basic/XP.png and /dev/null differ
diff --git a/smileys/Basic/angel.png b/smileys/Basic/angel.png
deleted file mode 100644
index ea539d756..000000000
Binary files a/smileys/Basic/angel.png and /dev/null differ
diff --git a/smileys/Basic/angry.png b/smileys/Basic/angry.png
deleted file mode 100644
index 4ff04fc6a..000000000
Binary files a/smileys/Basic/angry.png and /dev/null differ
diff --git a/smileys/Basic/beer.png b/smileys/Basic/beer.png
deleted file mode 100644
index efefcac84..000000000
Binary files a/smileys/Basic/beer.png and /dev/null differ
diff --git a/smileys/Basic/bomb.png b/smileys/Basic/bomb.png
deleted file mode 100644
index 57fe07ae9..000000000
Binary files a/smileys/Basic/bomb.png and /dev/null differ
diff --git a/smileys/Basic/bored.png b/smileys/Basic/bored.png
deleted file mode 100644
index 3f0296e13..000000000
Binary files a/smileys/Basic/bored.png and /dev/null differ
diff --git a/smileys/Basic/cookie.png b/smileys/Basic/cookie.png
deleted file mode 100644
index d870d2ed2..000000000
Binary files a/smileys/Basic/cookie.png and /dev/null differ
diff --git a/smileys/Basic/cool.png b/smileys/Basic/cool.png
deleted file mode 100644
index 24d04ea11..000000000
Binary files a/smileys/Basic/cool.png and /dev/null differ
diff --git a/smileys/Basic/crossing.png b/smileys/Basic/crossing.png
deleted file mode 100644
index c03a7a244..000000000
Binary files a/smileys/Basic/crossing.png and /dev/null differ
diff --git a/smileys/Basic/crying.png b/smileys/Basic/crying.png
deleted file mode 100644
index 03a89664f..000000000
Binary files a/smileys/Basic/crying.png and /dev/null differ
diff --git a/smileys/Basic/devil.png b/smileys/Basic/devil.png
deleted file mode 100644
index e27a9ef41..000000000
Binary files a/smileys/Basic/devil.png and /dev/null differ
diff --git a/smileys/Basic/diamond.png b/smileys/Basic/diamond.png
deleted file mode 100644
index e65411818..000000000
Binary files a/smileys/Basic/diamond.png and /dev/null differ
diff --git a/smileys/Basic/doh.png b/smileys/Basic/doh.png
deleted file mode 100644
index 6402f7364..000000000
Binary files a/smileys/Basic/doh.png and /dev/null differ
diff --git a/smileys/Basic/emoticons.xml b/smileys/Basic/emoticons.xml
deleted file mode 100644
index 6eadedb62..000000000
--- a/smileys/Basic/emoticons.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version='1.0'?>
-<messaging-emoticon-map>
-
-  <!-- first emoticons (9/13/14) -->
-  <emoticon file="angel.png">
-    <string>:angel:</string>
-    <string>0:)</string>
-    <string>O:)</string>
-    <string>0:-)</string>
-    <string>O:-)</string>
-    <string>😇</string>
-  </emoticon>
-
-  <emoticon file="beer.png">
-    <string>:beer:</string>
-    <string>🍺</string>
-  </emoticon>
-
-  <emoticon file="bored.png">
-    <string>|-o</string>
-    <string>\-o</string>
-    <string>/-o</string>
-    <string>:bored:</string>
-  </emoticon>
-
-  <emoticon file="crossing.png">
-    <string>:yn:</string>
-    <string>:crossing:</string>
-  </emoticon>
-
-  <emoticon file="crying.png">
-    <string>:cry:</string>
-    <string>:'(</string>
-    <string>:,(</string>
-    <string>😢</string>
-  </emoticon>
-
-  <emoticon file="devil.png">
-    <string>:devil:</string>
-    <string>:666:</string>
-    <string>}:-)</string>
-    <string>}:-></string>
-    <string>]:-)</string>
-    <string>]:-></string>
-    <string>>:-></string>
-    <string>😈</string>
-  </emoticon>
-
-  <emoticon file="doh.png">
-    <string>X.</string>
-    <string>X°</string>
-    <string>Xo</string>
-    <string>>:.</string>
-    <string>>:°</string>
-    <string>>:o</string>
-  </emoticon>
-
-  <emoticon file="evil.png">
-    <string>>:)</string>
-    <string>>:-)</string>
-    <string>>:D</string>
-    <string>>:-D</string>
-    <string>:evil:</string>
-  </emoticon>
-
-  <emoticon file="facepalm.png">
-    <string>:facepalm:</string>
-  </emoticon>
-
-  <emoticon file="finger.png">
-    <string>:finger:</string>
-    <string>:fuck:</string>
-  </emoticon>
-
-  <emoticon file="heart.png">
-    <string>&lt;3</string>
-    <string>:heart:</string>
-    <string>:love:</string>
-    <string>❤</string>
-  </emoticon>
-
-  <emoticon file="hi.png">
-    <string>:hi:</string>
-    <string>🙋</string>
-  </emoticon>
-
-  <emoticon file="highfive.png">
-    <string>:highfive:</string>
-  </emoticon>
-
-  <emoticon file="hot.png">
-    <string>(:|</string>
-    <string>':|</string>
-    <string>':(</string>
-    <string>':)</string>
-    <string>:sweating:</string>
-  </emoticon>
-
-  <emoticon file="tongue.png">
-    <string>:impertinent:</string>
-    <string>:-P</string>
-    <string>:-p</string>
-    <string>:P</string>
-    <string>:p</string>
-    <string>😛</string>
-  </emoticon>
-
-  <emoticon file="inlove.png">
-    <string>:inlove:</string>
-    <string>😍</string>
-  </emoticon>
-
-  <emoticon file="kiss.png">
-    <string>:kiss:</string>
-    <string>:*</string>
-    <string>:-*</string>
-    <string>😙</string>
-  </emoticon>
-
-  <emoticon file="lol.png">
-    <string>:lol:</string>
-    <string>:D</string>
-    <string>:-D</string>
-    <string>😄</string>
-  </emoticon>
-
-  <emoticon file="moustache.png">
-    <string>:-{)</string>
-    <string>:-{</string>
-    <string>:{)</string>
-    <string>:{</string>
-    <string>:moustache:</string>
-  </emoticon>
-
-  <emoticon file="MrSmith.png">
-    <string>:|</string>
-    <string>:-|</string>
-    <string>:disappointed:</string>
-  </emoticon>
-
-  <emoticon file="nerd.png">
-    <string>8-|</string>
-    <string>*8-|</string>
-    <string>:-B</string>
-    <string>8|</string>
-    <string>*8|</string>
-    <string>:B</string>
-    <string>:nerd:</string>
-  </emoticon>
-
-  <emoticon file="nospeak.png">
-    <string>:silence:</string>
-    <string>:-x</string>
-    <string>:-X</string>
-    <string>:x</string>
-    <string>:X</string>
-    <string>🙊</string>
-  </emoticon>
-
-  <emoticon file="oops.png">
-    <string>:-s</string>
-    <string>:s</string>
-    <string>:oops:</string>
-  </emoticon>
-
-  <emoticon file="party.png">
-    <string>&lt;:o)</string>
-    <string>&lt;:-P</string>
-    <string>&lt;:P</string>
-    <string>*&lt;:o)</string>
-    <string>*&lt;:-P</string>
-    <string>*&lt;:P</string>
-    <string>:party:</string>
-  </emoticon>
-
-  <emoticon file="pressed.png">
-    <string>:waiting:</string>
-  </emoticon>
-
-  <emoticon file="rain.png">
-    <string>:rain:</string>
-    <string>🌧</string>
-  </emoticon>
-
-  <emoticon file="rocknroll.png">
-    <string>\m/</string>
-    <string>:rocknroll:</string>
-    <string>:rock:</string>
-    <string>:hellyeah:</string>
-  </emoticon>
-
-  <emoticon file="sad.png">
-    <string>:sad:</string>
-    <string>:(</string>
-    <string>:-(</string>
-    <string>😞</string>
-  </emoticon>
-
-  <emoticon file="shy.png">
-    <string>:-$</string>
-    <string>:$</string>
-    <string>:shy:</string>
-  </emoticon>
-
-  <emoticon file="sleeping.png">
-    <string>:sleeping:</string>
-    <string>|-)</string>
-    <string>#)</string>
-    <string>😴</string>
-  </emoticon>
-
-  <emoticon file="smile.png">
-    <string>:smile:</string>
-    <string>:-)</string>
-    <string>:)</string>
-    <string>☺</string>
-  </emoticon>
-
-  <emoticon file="sniggering.png">
-    <string>:snigger:</string>
-    <string>:chuckle:</string>
-  </emoticon>
-
-  <emoticon file="suspicious.png">
-    <string>:smirk:</string>
-  </emoticon>
-
-  <emoticon file="vomit.png">
-    <string>:puke:</string>
-  </emoticon>
-
-  <emoticon file="wasntme.png">
-    <string>:wasntme:</string>
-  </emoticon>
-
-  <emoticon file="whew.png">
-    <string>:whew:</string>
-  </emoticon>
-
-  <emoticon file="wink.png">
-    <string>:wink:</string>
-   <string>;-)</string>
-   <string>;)</string>
-   <string>😉</string>
-  </emoticon>
-
-  <emoticon file="wondering.png">
-    <string>:^)</string>
-    <string>:wondering:</string>
-  </emoticon>
-
-  <emoticon file="X(.png">
-	<string>X(</string>
-  </emoticon>
-
-  <emoticon file="XD.png">
-    <string>XD</string>
-    <string>xD</string>
-    <string>😆</string>
-  </emoticon>
-
-  <emoticon file="XP.png">
-    <string>XP</string>
-    <string>xP</string>
-    <string>😝</string>
-  </emoticon>
-
-  <emoticon file="yawn.png">
-    <string>:yawn:</string>
-  </emoticon>
-
-  <!-- new emoticons (10/26/14) -->
-  <emoticon file="bomb.png">
-    <string>:bomb:</string>
-    <string>💣</string>
-  </emoticon>
-
-  <emoticon file="cookie.png">
-    <string>:cookie:</string>
-    <string>🍪</string>
-  </emoticon>
-
-  <emoticon file="diamond.png">
-    <string>:diamond:</string>
-    <string>🔷</string>
-  </emoticon>
-
-  <emoticon file="eye.png">
-    <string>:eye:</string>
-    <string>👁</string>
-  </emoticon>
-
-  <emoticon file="hacker_terminal.png">
-    <string>:terminal:</string>
-    <string>:hack:</string>
-  </emoticon>
-
-  <emoticon file="syringe.png">
-    <string>:syringe:</string>
-    <string>:injection:</string>
-    <string>💉</string>
-  </emoticon>
-
-  <emoticon file="toxlocker.png">
-    <string>:tox:</string>
-  </emoticon>
-
-  <!-- Preview emoticons -->
-  <emoticon file="happysmile.png">
-    <string>^^</string>
-    <string>^_^</string>
-    <string>:happy:</string>
-  </emoticon>
-
-  <emoticon file="impressed.png">
-    <string>:O</string>
-    <string>:o</string>
-    <string>:0</string>
-    <string>:wow:</string>
-  </emoticon>
-
-  <emoticon file="jealous.png">
-    <string>:jealous:</string>
-    <string>:envy:</string>
-  </emoticon>
-
-  <emoticon file="cool.png">
-    <string>:cool:</string>
-    <string>8)</string>
-    <string>8-)</string>
-    <string>😎</string>
-  </emoticon>
-
-  <emoticon file="angry.png">
-    <string>:angry:</string>
-    <string>>:-(</string>
-    <string>>:(</string>
-    <string>😠</string>
-  </emoticon>
-
-</messaging-emoticon-map>
diff --git a/smileys/Basic/evil.png b/smileys/Basic/evil.png
deleted file mode 100644
index 6f9b2ce72..000000000
Binary files a/smileys/Basic/evil.png and /dev/null differ
diff --git a/smileys/Basic/eye.png b/smileys/Basic/eye.png
deleted file mode 100644
index 60ff1db53..000000000
Binary files a/smileys/Basic/eye.png and /dev/null differ
diff --git a/smileys/Basic/facepalm.png b/smileys/Basic/facepalm.png
deleted file mode 100644
index 153c0e60e..000000000
Binary files a/smileys/Basic/facepalm.png and /dev/null differ
diff --git a/smileys/Basic/finger.png b/smileys/Basic/finger.png
deleted file mode 100644
index 204c8d7aa..000000000
Binary files a/smileys/Basic/finger.png and /dev/null differ
diff --git a/smileys/Basic/hacker_terminal.png b/smileys/Basic/hacker_terminal.png
deleted file mode 100644
index 98f47b21a..000000000
Binary files a/smileys/Basic/hacker_terminal.png and /dev/null differ
diff --git a/smileys/Basic/happysmile.png b/smileys/Basic/happysmile.png
deleted file mode 100644
index ae9ffeca6..000000000
Binary files a/smileys/Basic/happysmile.png and /dev/null differ
diff --git a/smileys/Basic/heart.png b/smileys/Basic/heart.png
deleted file mode 100644
index 548f852d6..000000000
Binary files a/smileys/Basic/heart.png and /dev/null differ
diff --git a/smileys/Basic/hi.png b/smileys/Basic/hi.png
deleted file mode 100644
index cf408b9ca..000000000
Binary files a/smileys/Basic/hi.png and /dev/null differ
diff --git a/smileys/Basic/highfive.png b/smileys/Basic/highfive.png
deleted file mode 100644
index 2356caec6..000000000
Binary files a/smileys/Basic/highfive.png and /dev/null differ
diff --git a/smileys/Basic/hot.png b/smileys/Basic/hot.png
deleted file mode 100644
index 04c34de8a..000000000
Binary files a/smileys/Basic/hot.png and /dev/null differ
diff --git a/smileys/Basic/impressed.png b/smileys/Basic/impressed.png
deleted file mode 100644
index 66ac8d8b5..000000000
Binary files a/smileys/Basic/impressed.png and /dev/null differ
diff --git a/smileys/Basic/inlove.png b/smileys/Basic/inlove.png
deleted file mode 100644
index 15572a9cd..000000000
Binary files a/smileys/Basic/inlove.png and /dev/null differ
diff --git a/smileys/Basic/jealous.png b/smileys/Basic/jealous.png
deleted file mode 100644
index 1cfc78487..000000000
Binary files a/smileys/Basic/jealous.png and /dev/null differ
diff --git a/smileys/Basic/kiss.png b/smileys/Basic/kiss.png
deleted file mode 100644
index 43637dc84..000000000
Binary files a/smileys/Basic/kiss.png and /dev/null differ
diff --git a/smileys/Basic/lol.png b/smileys/Basic/lol.png
deleted file mode 100644
index 969dc6f8b..000000000
Binary files a/smileys/Basic/lol.png and /dev/null differ
diff --git a/smileys/Basic/moustache.png b/smileys/Basic/moustache.png
deleted file mode 100644
index a27beb743..000000000
Binary files a/smileys/Basic/moustache.png and /dev/null differ
diff --git a/smileys/Basic/nerd.png b/smileys/Basic/nerd.png
deleted file mode 100644
index 4aff04815..000000000
Binary files a/smileys/Basic/nerd.png and /dev/null differ
diff --git a/smileys/Basic/nospeak.png b/smileys/Basic/nospeak.png
deleted file mode 100644
index 850e8fa7d..000000000
Binary files a/smileys/Basic/nospeak.png and /dev/null differ
diff --git a/smileys/Basic/oops.png b/smileys/Basic/oops.png
deleted file mode 100644
index 245ed4d2d..000000000
Binary files a/smileys/Basic/oops.png and /dev/null differ
diff --git a/smileys/Basic/party.png b/smileys/Basic/party.png
deleted file mode 100644
index 5e7acfaf4..000000000
Binary files a/smileys/Basic/party.png and /dev/null differ
diff --git a/smileys/Basic/pressed.png b/smileys/Basic/pressed.png
deleted file mode 100644
index b5726ee25..000000000
Binary files a/smileys/Basic/pressed.png and /dev/null differ
diff --git a/smileys/Basic/rain.png b/smileys/Basic/rain.png
deleted file mode 100644
index cdcde460d..000000000
Binary files a/smileys/Basic/rain.png and /dev/null differ
diff --git a/smileys/Basic/rocknroll.png b/smileys/Basic/rocknroll.png
deleted file mode 100644
index 6ac67155a..000000000
Binary files a/smileys/Basic/rocknroll.png and /dev/null differ
diff --git a/smileys/Basic/sad.png b/smileys/Basic/sad.png
deleted file mode 100644
index 8f086b5f4..000000000
Binary files a/smileys/Basic/sad.png and /dev/null differ
diff --git a/smileys/Basic/shy.png b/smileys/Basic/shy.png
deleted file mode 100644
index 4c5ae6cb6..000000000
Binary files a/smileys/Basic/shy.png and /dev/null differ
diff --git a/smileys/Basic/sleeping.png b/smileys/Basic/sleeping.png
deleted file mode 100644
index 47cd1582a..000000000
Binary files a/smileys/Basic/sleeping.png and /dev/null differ
diff --git a/smileys/Basic/smile.png b/smileys/Basic/smile.png
deleted file mode 100644
index cc622549f..000000000
Binary files a/smileys/Basic/smile.png and /dev/null differ
diff --git a/smileys/Basic/sniggering.png b/smileys/Basic/sniggering.png
deleted file mode 100644
index 209468d86..000000000
Binary files a/smileys/Basic/sniggering.png and /dev/null differ
diff --git a/smileys/Basic/suspicious.png b/smileys/Basic/suspicious.png
deleted file mode 100644
index 00217cbe5..000000000
Binary files a/smileys/Basic/suspicious.png and /dev/null differ
diff --git a/smileys/Basic/syringe.png b/smileys/Basic/syringe.png
deleted file mode 100644
index ebc921d95..000000000
Binary files a/smileys/Basic/syringe.png and /dev/null differ
diff --git a/smileys/Basic/tongue.png b/smileys/Basic/tongue.png
deleted file mode 100644
index f641810b0..000000000
Binary files a/smileys/Basic/tongue.png and /dev/null differ
diff --git a/smileys/Basic/toxlocker.png b/smileys/Basic/toxlocker.png
deleted file mode 100644
index caaf80e11..000000000
Binary files a/smileys/Basic/toxlocker.png and /dev/null differ
diff --git a/smileys/Basic/vomit.png b/smileys/Basic/vomit.png
deleted file mode 100644
index 5adf19756..000000000
Binary files a/smileys/Basic/vomit.png and /dev/null differ
diff --git a/smileys/Basic/wasntme.png b/smileys/Basic/wasntme.png
deleted file mode 100644
index 3a1805577..000000000
Binary files a/smileys/Basic/wasntme.png and /dev/null differ
diff --git a/smileys/Basic/whew.png b/smileys/Basic/whew.png
deleted file mode 100644
index 6f531b205..000000000
Binary files a/smileys/Basic/whew.png and /dev/null differ
diff --git a/smileys/Basic/wink.png b/smileys/Basic/wink.png
deleted file mode 100644
index 6c19c88b3..000000000
Binary files a/smileys/Basic/wink.png and /dev/null differ
diff --git a/smileys/Basic/wondering.png b/smileys/Basic/wondering.png
deleted file mode 100644
index 9b09cae7a..000000000
Binary files a/smileys/Basic/wondering.png and /dev/null differ
diff --git a/smileys/Basic/yawn.png b/smileys/Basic/yawn.png
deleted file mode 100644
index 754721e5c..000000000
Binary files a/smileys/Basic/yawn.png and /dev/null differ
diff --git a/smileys/smileys.qrc b/smileys/smileys.qrc
index b07d7691e..d74b83eb3 100644
--- a/smileys/smileys.qrc
+++ b/smileys/smileys.qrc
@@ -1,60 +1,5 @@
 <RCC>
     <qresource prefix="/smileys">
-        <file>Basic/angel.png</file>
-        <file>Basic/angry.png</file>
-        <file>Basic/beer.png</file>
-        <file>Basic/bomb.png</file>
-        <file>Basic/bored.png</file>
-        <file>Basic/cookie.png</file>
-        <file>Basic/cool.png</file>
-        <file>Basic/crossing.png</file>
-        <file>Basic/crying.png</file>
-        <file>Basic/devil.png</file>
-        <file>Basic/diamond.png</file>
-        <file>Basic/doh.png</file>
-        <file>Basic/emoticons.xml</file>
-        <file>Basic/evil.png</file>
-        <file>Basic/eye.png</file>
-        <file>Basic/facepalm.png</file>
-        <file>Basic/finger.png</file>
-        <file>Basic/hacker_terminal.png</file>
-        <file>Basic/happysmile.png</file>
-        <file>Basic/heart.png</file>
-        <file>Basic/hi.png</file>
-        <file>Basic/highfive.png</file>
-        <file>Basic/hot.png</file>
-        <file>Basic/impressed.png</file>
-        <file>Basic/inlove.png</file>
-        <file>Basic/jealous.png</file>
-        <file>Basic/kiss.png</file>
-        <file>Basic/lol.png</file>
-        <file>Basic/moustache.png</file>
-        <file>Basic/MrSmith.png</file>
-        <file>Basic/nerd.png</file>
-        <file>Basic/nospeak.png</file>
-        <file>Basic/oops.png</file>
-        <file>Basic/party.png</file>
-        <file>Basic/pressed.png</file>
-        <file>Basic/rain.png</file>
-        <file>Basic/rocknroll.png</file>
-        <file>Basic/sad.png</file>
-        <file>Basic/shy.png</file>
-        <file>Basic/sleeping.png</file>
-        <file>Basic/smile.png</file>
-        <file>Basic/sniggering.png</file>
-        <file>Basic/suspicious.png</file>
-        <file>Basic/syringe.png</file>
-        <file>Basic/tongue.png</file>
-        <file>Basic/toxlocker.png</file>
-        <file>Basic/vomit.png</file>
-        <file>Basic/wasntme.png</file>
-        <file>Basic/whew.png</file>
-        <file>Basic/wink.png</file>
-        <file>Basic/wondering.png</file>
-        <file>Basic/X(.png</file>
-        <file>Basic/XD.png</file>
-        <file>Basic/XP.png</file>
-        <file>Basic/yawn.png</file>
         <file>Classic/angry.png</file>
         <file>Classic/cool.png</file>
         <file>Classic/crying.png</file>