diff --git a/smileys/Basic/MrSmith.png b/smileys/Basic/MrSmith.png
deleted file mode 100644
index 87a1480b0e..0000000000
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 6e27695fdb..0000000000
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 75891d4fb4..0000000000
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 db412a8989..0000000000
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 ea539d756d..0000000000
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 4ff04fc6a9..0000000000
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 efefcac841..0000000000
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 57fe07ae91..0000000000
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 3f0296e13f..0000000000
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 d870d2ed2d..0000000000
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 24d04ea117..0000000000
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 c03a7a244d..0000000000
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 03a89664ff..0000000000
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 e27a9ef41e..0000000000
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 e65411818d..0000000000
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 6402f73641..0000000000
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 6eadedb62b..0000000000
--- a/smileys/Basic/emoticons.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-
-
-
-
-
- :angel:
- 0:)
- O:)
- 0:-)
- O:-)
- 😇
-
-
-
- :beer:
- 🍺
-
-
-
- |-o
- \-o
- /-o
- :bored:
-
-
-
- :yn:
- :crossing:
-
-
-
- :cry:
- :'(
- :,(
- 😢
-
-
-
- :devil:
- :666:
- }:-)
- }:->
- ]:-)
- ]:->
- >:->
- 😈
-
-
-
- X.
- X°
- Xo
- >:.
- >:°
- >:o
-
-
-
- >:)
- >:-)
- >:D
- >:-D
- :evil:
-
-
-
- :facepalm:
-
-
-
- :finger:
- :fuck:
-
-
-
- <3
- :heart:
- :love:
- ❤
-
-
-
- :hi:
- 🙋
-
-
-
- :highfive:
-
-
-
- (:|
- ':|
- ':(
- ':)
- :sweating:
-
-
-
- :impertinent:
- :-P
- :-p
- :P
- :p
- 😛
-
-
-
- :inlove:
- 😍
-
-
-
- :kiss:
- :*
- :-*
- 😙
-
-
-
- :lol:
- :D
- :-D
- 😄
-
-
-
- :-{)
- :-{
- :{)
- :{
- :moustache:
-
-
-
- :|
- :-|
- :disappointed:
-
-
-
- 8-|
- *8-|
- :-B
- 8|
- *8|
- :B
- :nerd:
-
-
-
- :silence:
- :-x
- :-X
- :x
- :X
- 🙊
-
-
-
- :-s
- :s
- :oops:
-
-
-
- <:o)
- <:-P
- <:P
- *<:o)
- *<:-P
- *<:P
- :party:
-
-
-
- :waiting:
-
-
-
- :rain:
- 🌧
-
-
-
- \m/
- :rocknroll:
- :rock:
- :hellyeah:
-
-
-
- :sad:
- :(
- :-(
- 😞
-
-
-
- :-$
- :$
- :shy:
-
-
-
- :sleeping:
- |-)
- #)
- 😴
-
-
-
- :smile:
- :-)
- :)
- ☺
-
-
-
- :snigger:
- :chuckle:
-
-
-
- :smirk:
-
-
-
- :puke:
-
-
-
- :wasntme:
-
-
-
- :whew:
-
-
-
- :wink:
- ;-)
- ;)
- 😉
-
-
-
- :^)
- :wondering:
-
-
-
- X(
-
-
-
- XD
- xD
- 😆
-
-
-
- XP
- xP
- 😝
-
-
-
- :yawn:
-
-
-
-
- :bomb:
- 💣
-
-
-
- :cookie:
- 🍪
-
-
-
- :diamond:
- 🔷
-
-
-
- :eye:
- 👁
-
-
-
- :terminal:
- :hack:
-
-
-
- :syringe:
- :injection:
- 💉
-
-
-
- :tox:
-
-
-
-
- ^^
- ^_^
- :happy:
-
-
-
- :O
- :o
- :0
- :wow:
-
-
-
- :jealous:
- :envy:
-
-
-
- :cool:
- 8)
- 8-)
- 😎
-
-
-
- :angry:
- >:-(
- >:(
- 😠
-
-
-
diff --git a/smileys/Basic/evil.png b/smileys/Basic/evil.png
deleted file mode 100644
index 6f9b2ce722..0000000000
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 60ff1db533..0000000000
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 153c0e60ee..0000000000
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 204c8d7aaa..0000000000
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 98f47b21ad..0000000000
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 ae9ffeca63..0000000000
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 548f852d6c..0000000000
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 cf408b9caf..0000000000
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 2356caec63..0000000000
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 04c34de8a4..0000000000
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 66ac8d8b55..0000000000
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 15572a9cdf..0000000000
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 1cfc784879..0000000000
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 43637dc841..0000000000
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 969dc6f8bd..0000000000
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 a27beb7432..0000000000
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 4aff04815a..0000000000
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 850e8fa7dc..0000000000
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 245ed4d2df..0000000000
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 5e7acfaf49..0000000000
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 b5726ee251..0000000000
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 cdcde460d1..0000000000
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 6ac67155a0..0000000000
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 8f086b5f41..0000000000
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 4c5ae6cb65..0000000000
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 47cd1582aa..0000000000
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 cc622549fb..0000000000
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 209468d86a..0000000000
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 00217cbe52..0000000000
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 ebc921d95c..0000000000
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 f641810b0e..0000000000
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 caaf80e113..0000000000
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 5adf197560..0000000000
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 3a18055770..0000000000
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 6f531b2055..0000000000
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 6c19c88b3e..0000000000
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 9b09cae7a9..0000000000
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 754721e5c3..0000000000
Binary files a/smileys/Basic/yawn.png and /dev/null differ
diff --git a/smileys/smileys.qrc b/smileys/smileys.qrc
index b07d7691e3..d74b83eb3d 100644
--- a/smileys/smileys.qrc
+++ b/smileys/smileys.qrc
@@ -1,60 +1,5 @@
- Basic/angel.png
- Basic/angry.png
- Basic/beer.png
- Basic/bomb.png
- Basic/bored.png
- Basic/cookie.png
- Basic/cool.png
- Basic/crossing.png
- Basic/crying.png
- Basic/devil.png
- Basic/diamond.png
- Basic/doh.png
- Basic/emoticons.xml
- Basic/evil.png
- Basic/eye.png
- Basic/facepalm.png
- Basic/finger.png
- Basic/hacker_terminal.png
- Basic/happysmile.png
- Basic/heart.png
- Basic/hi.png
- Basic/highfive.png
- Basic/hot.png
- Basic/impressed.png
- Basic/inlove.png
- Basic/jealous.png
- Basic/kiss.png
- Basic/lol.png
- Basic/moustache.png
- Basic/MrSmith.png
- Basic/nerd.png
- Basic/nospeak.png
- Basic/oops.png
- Basic/party.png
- Basic/pressed.png
- Basic/rain.png
- Basic/rocknroll.png
- Basic/sad.png
- Basic/shy.png
- Basic/sleeping.png
- Basic/smile.png
- Basic/sniggering.png
- Basic/suspicious.png
- Basic/syringe.png
- Basic/tongue.png
- Basic/toxlocker.png
- Basic/vomit.png
- Basic/wasntme.png
- Basic/whew.png
- Basic/wink.png
- Basic/wondering.png
- Basic/X(.png
- Basic/XD.png
- Basic/XP.png
- Basic/yawn.png
Classic/angry.png
Classic/cool.png
Classic/crying.png