diff --git a/data/emoticons/animated/angry.png b/data/emoticons/animated/angry.png
deleted file mode 100644
index 867a8d4f0..000000000
Binary files a/data/emoticons/animated/angry.png and /dev/null differ
diff --git a/data/emoticons/animated/bat.gif b/data/emoticons/animated/bat.gif
deleted file mode 100644
index b77fa2ddf..000000000
Binary files a/data/emoticons/animated/bat.gif and /dev/null differ
diff --git a/data/emoticons/animated/beer.png b/data/emoticons/animated/beer.png
deleted file mode 100644
index a8ecc6597..000000000
Binary files a/data/emoticons/animated/beer.png and /dev/null differ
diff --git a/data/emoticons/animated/biggrin.png b/data/emoticons/animated/biggrin.png
deleted file mode 100644
index 49579b275..000000000
Binary files a/data/emoticons/animated/biggrin.png and /dev/null differ
diff --git a/data/emoticons/animated/blush.png b/data/emoticons/animated/blush.png
deleted file mode 100644
index 270a27924..000000000
Binary files a/data/emoticons/animated/blush.png and /dev/null differ
diff --git a/data/emoticons/animated/boy.png b/data/emoticons/animated/boy.png
deleted file mode 100644
index 2c2ac9111..000000000
Binary files a/data/emoticons/animated/boy.png and /dev/null differ
diff --git a/data/emoticons/animated/brflower.png b/data/emoticons/animated/brflower.png
deleted file mode 100644
index 009e664f9..000000000
Binary files a/data/emoticons/animated/brflower.png and /dev/null differ
diff --git a/data/emoticons/animated/brheart.png b/data/emoticons/animated/brheart.png
deleted file mode 100644
index 300eb794c..000000000
Binary files a/data/emoticons/animated/brheart.png and /dev/null differ
diff --git a/data/emoticons/animated/cake.gif b/data/emoticons/animated/cake.gif
deleted file mode 100644
index 5b81ca7fa..000000000
Binary files a/data/emoticons/animated/cake.gif and /dev/null differ
diff --git a/data/emoticons/animated/cigarette.gif b/data/emoticons/animated/cigarette.gif
deleted file mode 100644
index 8e238a490..000000000
Binary files a/data/emoticons/animated/cigarette.gif and /dev/null differ
diff --git a/data/emoticons/animated/coffee.png b/data/emoticons/animated/coffee.png
deleted file mode 100644
index f16b33d8e..000000000
Binary files a/data/emoticons/animated/coffee.png and /dev/null differ
diff --git a/data/emoticons/animated/coolglasses.png b/data/emoticons/animated/coolglasses.png
deleted file mode 100644
index acf149ba9..000000000
Binary files a/data/emoticons/animated/coolglasses.png and /dev/null differ
diff --git a/data/emoticons/animated/cry.gif b/data/emoticons/animated/cry.gif
deleted file mode 100644
index dbd2f5acf..000000000
Binary files a/data/emoticons/animated/cry.gif and /dev/null differ
diff --git a/data/emoticons/animated/cuffs.png b/data/emoticons/animated/cuffs.png
deleted file mode 100644
index ac2082598..000000000
Binary files a/data/emoticons/animated/cuffs.png and /dev/null differ
diff --git a/data/emoticons/animated/devil.png b/data/emoticons/animated/devil.png
deleted file mode 100644
index 49381879d..000000000
Binary files a/data/emoticons/animated/devil.png and /dev/null differ
diff --git a/data/emoticons/animated/dontknow.gif b/data/emoticons/animated/dontknow.gif
deleted file mode 100644
index 5934a4305..000000000
Binary files a/data/emoticons/animated/dontknow.gif and /dev/null differ
diff --git a/data/emoticons/animated/drink.png b/data/emoticons/animated/drink.png
deleted file mode 100644
index d8c262ca6..000000000
Binary files a/data/emoticons/animated/drink.png and /dev/null differ
diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
deleted file mode 100644
index bf464b560..000000000
--- a/data/emoticons/animated/emoticons.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# coding=utf-8
-from collections import OrderedDict
-
-emoticons = OrderedDict((
-    ('smile.png', [':-)', ':)']),
-    ('coolglasses.png', ['B-)', '(H)']),
-    ('wink.gif', [';-)', ';)']),
-    ('biggrin.png', [':-D', ':D']),
-    ('unhappy.png', [':-(', ':(']),
-    ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]),
-    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
-    ('blush.png', [':-$', ':$']),
-    ('angry.png', [':-@', ':@']),
-    ('bat.gif', [':-[', ':[']),
-    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
-    ('stare.png', [':-|', ':|']),
-    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
-    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
-    ('oh.png', ['=-O', ':-O', ':O']),
-    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
-    ('pussy.png', ['(@)']),
-    ('cuffs.png', ['(%)']),
-    ('moon.png', ['(S)']),
-    ('lamp.png', ['(I)']),
-    ('music.png', ['(8)']),
-    ('beer.png', ['(B)', '*DRINK*']),
-    ('brflower.png', ['(W)']),
-    ('boy.png', ['(Z)']),
-    ('girl.png', ['(X)']),
-    ('mail.png', ['(E)']),
-    ('thumbdown.png', ['(N)']),
-    ('photo.png', ['(P)']),
-    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
-    ('hugleft.png', ['(})']),
-    ('brheart.png', ['</3', '(U)']),
-    ('flower.png', ['@}->--', '(F)']),
-    ('drink.png', ['(D)']),
-    ('phone.png', ['(T)']),
-    ('coffee.png', ['(C)']),
-    ('hugright.png', ['({)']),
-    ('star.png', ['(*)']),
-    ('rainbow.png', ['(R)']),
-    ('cigarette.gif', ['(ci)']),
-    ('cake.gif', ['(^)']),
-    ('dontknow.gif', [':^)']),
-    ('eyeroll.gif', ['8-)']),
-    ('lightning.gif', ['(li)']),
-    ('party.gif', ['<:o)']),
-    ('sleepy.gif', ['|-)']),
-    ('think.gif', ['*-)']),
-    ('puke.gif', [':-!']),
-))
diff --git a/data/emoticons/animated/eyeroll.gif b/data/emoticons/animated/eyeroll.gif
deleted file mode 100644
index 559cdd3f3..000000000
Binary files a/data/emoticons/animated/eyeroll.gif and /dev/null differ
diff --git a/data/emoticons/animated/flower.png b/data/emoticons/animated/flower.png
deleted file mode 100644
index 27c7a2eca..000000000
Binary files a/data/emoticons/animated/flower.png and /dev/null differ
diff --git a/data/emoticons/animated/frowning.png b/data/emoticons/animated/frowning.png
deleted file mode 100644
index df5030de4..000000000
Binary files a/data/emoticons/animated/frowning.png and /dev/null differ
diff --git a/data/emoticons/animated/girl.png b/data/emoticons/animated/girl.png
deleted file mode 100644
index 1e2573d8a..000000000
Binary files a/data/emoticons/animated/girl.png and /dev/null differ
diff --git a/data/emoticons/animated/heart.png b/data/emoticons/animated/heart.png
deleted file mode 100644
index 4c63f2cd6..000000000
Binary files a/data/emoticons/animated/heart.png and /dev/null differ
diff --git a/data/emoticons/animated/hugleft.png b/data/emoticons/animated/hugleft.png
deleted file mode 100644
index af59b6757..000000000
Binary files a/data/emoticons/animated/hugleft.png and /dev/null differ
diff --git a/data/emoticons/animated/hugright.png b/data/emoticons/animated/hugright.png
deleted file mode 100644
index 08bdc82d5..000000000
Binary files a/data/emoticons/animated/hugright.png and /dev/null differ
diff --git a/data/emoticons/animated/kiss.png b/data/emoticons/animated/kiss.png
deleted file mode 100644
index c9d78af19..000000000
Binary files a/data/emoticons/animated/kiss.png and /dev/null differ
diff --git a/data/emoticons/animated/lamp.png b/data/emoticons/animated/lamp.png
deleted file mode 100644
index 967d3f9c8..000000000
Binary files a/data/emoticons/animated/lamp.png and /dev/null differ
diff --git a/data/emoticons/animated/lightning.gif b/data/emoticons/animated/lightning.gif
deleted file mode 100644
index 4f69f0f03..000000000
Binary files a/data/emoticons/animated/lightning.gif and /dev/null differ
diff --git a/data/emoticons/animated/mail.png b/data/emoticons/animated/mail.png
deleted file mode 100644
index 2d1555ce4..000000000
Binary files a/data/emoticons/animated/mail.png and /dev/null differ
diff --git a/data/emoticons/animated/moon.png b/data/emoticons/animated/moon.png
deleted file mode 100644
index d2addeb35..000000000
Binary files a/data/emoticons/animated/moon.png and /dev/null differ
diff --git a/data/emoticons/animated/music.png b/data/emoticons/animated/music.png
deleted file mode 100644
index d69b5f4e0..000000000
Binary files a/data/emoticons/animated/music.png and /dev/null differ
diff --git a/data/emoticons/animated/oh.png b/data/emoticons/animated/oh.png
deleted file mode 100644
index 5cce4db64..000000000
Binary files a/data/emoticons/animated/oh.png and /dev/null differ
diff --git a/data/emoticons/animated/party.gif b/data/emoticons/animated/party.gif
deleted file mode 100644
index 9336aabd5..000000000
Binary files a/data/emoticons/animated/party.gif and /dev/null differ
diff --git a/data/emoticons/animated/phone.png b/data/emoticons/animated/phone.png
deleted file mode 100644
index 2e087bde3..000000000
Binary files a/data/emoticons/animated/phone.png and /dev/null differ
diff --git a/data/emoticons/animated/photo.png b/data/emoticons/animated/photo.png
deleted file mode 100644
index 6e69d3c7b..000000000
Binary files a/data/emoticons/animated/photo.png and /dev/null differ
diff --git a/data/emoticons/animated/puke.gif b/data/emoticons/animated/puke.gif
deleted file mode 100644
index c35bf7fad..000000000
Binary files a/data/emoticons/animated/puke.gif and /dev/null differ
diff --git a/data/emoticons/animated/pussy.png b/data/emoticons/animated/pussy.png
deleted file mode 100644
index cc82ea410..000000000
Binary files a/data/emoticons/animated/pussy.png and /dev/null differ
diff --git a/data/emoticons/animated/rainbow.png b/data/emoticons/animated/rainbow.png
deleted file mode 100644
index 4f4ad96eb..000000000
Binary files a/data/emoticons/animated/rainbow.png and /dev/null differ
diff --git a/data/emoticons/animated/sleepy.gif b/data/emoticons/animated/sleepy.gif
deleted file mode 100644
index 6eaf9233f..000000000
Binary files a/data/emoticons/animated/sleepy.gif and /dev/null differ
diff --git a/data/emoticons/animated/smile.png b/data/emoticons/animated/smile.png
deleted file mode 100644
index 51b865443..000000000
Binary files a/data/emoticons/animated/smile.png and /dev/null differ
diff --git a/data/emoticons/animated/star.png b/data/emoticons/animated/star.png
deleted file mode 100644
index 8c7d06ea2..000000000
Binary files a/data/emoticons/animated/star.png and /dev/null differ
diff --git a/data/emoticons/animated/stare.png b/data/emoticons/animated/stare.png
deleted file mode 100644
index 6ee982203..000000000
Binary files a/data/emoticons/animated/stare.png and /dev/null differ
diff --git a/data/emoticons/animated/think.gif b/data/emoticons/animated/think.gif
deleted file mode 100644
index 63750f7e3..000000000
Binary files a/data/emoticons/animated/think.gif and /dev/null differ
diff --git a/data/emoticons/animated/thumbdown.png b/data/emoticons/animated/thumbdown.png
deleted file mode 100644
index a6ce7f1d3..000000000
Binary files a/data/emoticons/animated/thumbdown.png and /dev/null differ
diff --git a/data/emoticons/animated/thumbup.png b/data/emoticons/animated/thumbup.png
deleted file mode 100644
index b2da92bcd..000000000
Binary files a/data/emoticons/animated/thumbup.png and /dev/null differ
diff --git a/data/emoticons/animated/tongue.png b/data/emoticons/animated/tongue.png
deleted file mode 100644
index f5fa51860..000000000
Binary files a/data/emoticons/animated/tongue.png and /dev/null differ
diff --git a/data/emoticons/animated/unhappy.png b/data/emoticons/animated/unhappy.png
deleted file mode 100644
index a570b5e17..000000000
Binary files a/data/emoticons/animated/unhappy.png and /dev/null differ
diff --git a/data/emoticons/animated/wink.gif b/data/emoticons/animated/wink.gif
deleted file mode 100644
index fc95fad49..000000000
Binary files a/data/emoticons/animated/wink.gif and /dev/null differ
diff --git a/data/emoticons/static-big/angry.png b/data/emoticons/static-big/angry.png
deleted file mode 100644
index 867a8d4f0..000000000
Binary files a/data/emoticons/static-big/angry.png and /dev/null differ
diff --git a/data/emoticons/static-big/bat.png b/data/emoticons/static-big/bat.png
deleted file mode 100644
index 6270cf6e1..000000000
Binary files a/data/emoticons/static-big/bat.png and /dev/null differ
diff --git a/data/emoticons/static-big/beer.png b/data/emoticons/static-big/beer.png
deleted file mode 100644
index a8ecc6597..000000000
Binary files a/data/emoticons/static-big/beer.png and /dev/null differ
diff --git a/data/emoticons/static-big/biggrin.png b/data/emoticons/static-big/biggrin.png
deleted file mode 100644
index 49579b275..000000000
Binary files a/data/emoticons/static-big/biggrin.png and /dev/null differ
diff --git a/data/emoticons/static-big/blush.png b/data/emoticons/static-big/blush.png
deleted file mode 100644
index 270a27924..000000000
Binary files a/data/emoticons/static-big/blush.png and /dev/null differ
diff --git a/data/emoticons/static-big/boy.png b/data/emoticons/static-big/boy.png
deleted file mode 100644
index 2c2ac9111..000000000
Binary files a/data/emoticons/static-big/boy.png and /dev/null differ
diff --git a/data/emoticons/static-big/brflower.png b/data/emoticons/static-big/brflower.png
deleted file mode 100644
index 009e664f9..000000000
Binary files a/data/emoticons/static-big/brflower.png and /dev/null differ
diff --git a/data/emoticons/static-big/brheart.png b/data/emoticons/static-big/brheart.png
deleted file mode 100644
index 300eb794c..000000000
Binary files a/data/emoticons/static-big/brheart.png and /dev/null differ
diff --git a/data/emoticons/static-big/coffee.png b/data/emoticons/static-big/coffee.png
deleted file mode 100644
index f16b33d8e..000000000
Binary files a/data/emoticons/static-big/coffee.png and /dev/null differ
diff --git a/data/emoticons/static-big/coolglasses.png b/data/emoticons/static-big/coolglasses.png
deleted file mode 100644
index acf149ba9..000000000
Binary files a/data/emoticons/static-big/coolglasses.png and /dev/null differ
diff --git a/data/emoticons/static-big/cry.png b/data/emoticons/static-big/cry.png
deleted file mode 100644
index e52b6f985..000000000
Binary files a/data/emoticons/static-big/cry.png and /dev/null differ
diff --git a/data/emoticons/static-big/cuffs.png b/data/emoticons/static-big/cuffs.png
deleted file mode 100644
index ac2082598..000000000
Binary files a/data/emoticons/static-big/cuffs.png and /dev/null differ
diff --git a/data/emoticons/static-big/devil.png b/data/emoticons/static-big/devil.png
deleted file mode 100644
index 49381879d..000000000
Binary files a/data/emoticons/static-big/devil.png and /dev/null differ
diff --git a/data/emoticons/static-big/drink.png b/data/emoticons/static-big/drink.png
deleted file mode 100644
index d8c262ca6..000000000
Binary files a/data/emoticons/static-big/drink.png and /dev/null differ
diff --git a/data/emoticons/static-big/emoticons.py b/data/emoticons/static-big/emoticons.py
deleted file mode 100644
index ba51e1852..000000000
--- a/data/emoticons/static-big/emoticons.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# coding=utf-8
-from collections import OrderedDict
-
-emoticons = OrderedDict((
-    ('smile.png', [':-)', ':)']),
-    ('coolglasses.png', ['8-)', 'B-)', '(H)']),
-    ('wink.png', [';-)', ';)']),
-    ('biggrin.png', [':-D', ':D']),
-    ('unhappy.png', [':-(', ':(']),
-    ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
-    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
-    ('blush.png', [':-$', ':$']),
-    ('angry.png', [':-@', ':@']),
-    ('bat.png', [':-[', ':[']),
-    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
-    ('stare.png', [':-|', ':|']),
-    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
-    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
-    ('oh.png', ['=-O', ':-O', ':O']),
-    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
-    ('lion.png', [':3', '>:3']),
-    ('pussy.png', ['(@)', '=^.^=']),
-    ('cuffs.png', ['(%)']),
-    ('moon.png', ['(S)']),
-    ('lamp.png', ['(I)']),
-    ('music.png', ['(8)']),
-    ('beer.png', ['(B)', '*DRINK*']),
-    ('brflower.png', ['(W)']),
-    ('boy.png', ['(Z)']),
-    ('girl.png', ['(X)']),
-    ('mail.png', ['(E)']),
-    ('thumbdown.png', ['(N)']),
-    ('photo.png', ['(P)']),
-    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
-    ('hugleft.png', ['(})']),
-    ('brheart.png', ['</3', '(U)']),
-    ('flower.png', ['@}->--', '(F)']),
-    ('drink.png', ['(D)']),
-    ('phone.png', ['(T)']),
-    ('coffee.png', ['(C)']),
-    ('hugright.png', ['({)']),
-    ('star.png', ['(*)']),
-    ('rainbow.png', ['(R)']),
-    ('puke.png', [':-!']),
-))
diff --git a/data/emoticons/static-big/flower.png b/data/emoticons/static-big/flower.png
deleted file mode 100644
index 27c7a2eca..000000000
Binary files a/data/emoticons/static-big/flower.png and /dev/null differ
diff --git a/data/emoticons/static-big/frowning.png b/data/emoticons/static-big/frowning.png
deleted file mode 100644
index df5030de4..000000000
Binary files a/data/emoticons/static-big/frowning.png and /dev/null differ
diff --git a/data/emoticons/static-big/girl.png b/data/emoticons/static-big/girl.png
deleted file mode 100644
index 1e2573d8a..000000000
Binary files a/data/emoticons/static-big/girl.png and /dev/null differ
diff --git a/data/emoticons/static-big/heart.png b/data/emoticons/static-big/heart.png
deleted file mode 100644
index 4c63f2cd6..000000000
Binary files a/data/emoticons/static-big/heart.png and /dev/null differ
diff --git a/data/emoticons/static-big/hugleft.png b/data/emoticons/static-big/hugleft.png
deleted file mode 100644
index af59b6757..000000000
Binary files a/data/emoticons/static-big/hugleft.png and /dev/null differ
diff --git a/data/emoticons/static-big/hugright.png b/data/emoticons/static-big/hugright.png
deleted file mode 100644
index 08bdc82d5..000000000
Binary files a/data/emoticons/static-big/hugright.png and /dev/null differ
diff --git a/data/emoticons/static-big/kiss.png b/data/emoticons/static-big/kiss.png
deleted file mode 100644
index c9d78af19..000000000
Binary files a/data/emoticons/static-big/kiss.png and /dev/null differ
diff --git a/data/emoticons/static-big/lamp.png b/data/emoticons/static-big/lamp.png
deleted file mode 100644
index 967d3f9c8..000000000
Binary files a/data/emoticons/static-big/lamp.png and /dev/null differ
diff --git a/data/emoticons/static-big/lion.png b/data/emoticons/static-big/lion.png
deleted file mode 100644
index ae10ca7bf..000000000
Binary files a/data/emoticons/static-big/lion.png and /dev/null differ
diff --git a/data/emoticons/static-big/mail.png b/data/emoticons/static-big/mail.png
deleted file mode 100644
index 2d1555ce4..000000000
Binary files a/data/emoticons/static-big/mail.png and /dev/null differ
diff --git a/data/emoticons/static-big/moon.png b/data/emoticons/static-big/moon.png
deleted file mode 100644
index d2addeb35..000000000
Binary files a/data/emoticons/static-big/moon.png and /dev/null differ
diff --git a/data/emoticons/static-big/music.png b/data/emoticons/static-big/music.png
deleted file mode 100644
index d69b5f4e0..000000000
Binary files a/data/emoticons/static-big/music.png and /dev/null differ
diff --git a/data/emoticons/static-big/oh.png b/data/emoticons/static-big/oh.png
deleted file mode 100644
index 5cce4db64..000000000
Binary files a/data/emoticons/static-big/oh.png and /dev/null differ
diff --git a/data/emoticons/static-big/phone.png b/data/emoticons/static-big/phone.png
deleted file mode 100644
index 2e087bde3..000000000
Binary files a/data/emoticons/static-big/phone.png and /dev/null differ
diff --git a/data/emoticons/static-big/photo.png b/data/emoticons/static-big/photo.png
deleted file mode 100644
index 6e69d3c7b..000000000
Binary files a/data/emoticons/static-big/photo.png and /dev/null differ
diff --git a/data/emoticons/static-big/puke.png b/data/emoticons/static-big/puke.png
deleted file mode 100644
index 0a24e77a9..000000000
Binary files a/data/emoticons/static-big/puke.png and /dev/null differ
diff --git a/data/emoticons/static-big/pussy.png b/data/emoticons/static-big/pussy.png
deleted file mode 100644
index cc82ea410..000000000
Binary files a/data/emoticons/static-big/pussy.png and /dev/null differ
diff --git a/data/emoticons/static-big/rainbow.png b/data/emoticons/static-big/rainbow.png
deleted file mode 100644
index 4f4ad96eb..000000000
Binary files a/data/emoticons/static-big/rainbow.png and /dev/null differ
diff --git a/data/emoticons/static-big/smile.png b/data/emoticons/static-big/smile.png
deleted file mode 100644
index 51b865443..000000000
Binary files a/data/emoticons/static-big/smile.png and /dev/null differ
diff --git a/data/emoticons/static-big/star.png b/data/emoticons/static-big/star.png
deleted file mode 100644
index 8c7d06ea2..000000000
Binary files a/data/emoticons/static-big/star.png and /dev/null differ
diff --git a/data/emoticons/static-big/stare.png b/data/emoticons/static-big/stare.png
deleted file mode 100644
index 6ee982203..000000000
Binary files a/data/emoticons/static-big/stare.png and /dev/null differ
diff --git a/data/emoticons/static-big/thumbdown.png b/data/emoticons/static-big/thumbdown.png
deleted file mode 100644
index a6ce7f1d3..000000000
Binary files a/data/emoticons/static-big/thumbdown.png and /dev/null differ
diff --git a/data/emoticons/static-big/thumbup.png b/data/emoticons/static-big/thumbup.png
deleted file mode 100644
index b2da92bcd..000000000
Binary files a/data/emoticons/static-big/thumbup.png and /dev/null differ
diff --git a/data/emoticons/static-big/tongue.png b/data/emoticons/static-big/tongue.png
deleted file mode 100644
index f5fa51860..000000000
Binary files a/data/emoticons/static-big/tongue.png and /dev/null differ
diff --git a/data/emoticons/static-big/unhappy.png b/data/emoticons/static-big/unhappy.png
deleted file mode 100644
index a570b5e17..000000000
Binary files a/data/emoticons/static-big/unhappy.png and /dev/null differ
diff --git a/data/emoticons/static-big/wink.png b/data/emoticons/static-big/wink.png
deleted file mode 100644
index ce02638fc..000000000
Binary files a/data/emoticons/static-big/wink.png and /dev/null differ
diff --git a/data/emoticons/static/angry.png b/data/emoticons/static/angry.png
deleted file mode 100644
index 741951b43..000000000
Binary files a/data/emoticons/static/angry.png and /dev/null differ
diff --git a/data/emoticons/static/bat.png b/data/emoticons/static/bat.png
deleted file mode 100644
index 5237a404f..000000000
Binary files a/data/emoticons/static/bat.png and /dev/null differ
diff --git a/data/emoticons/static/beer.png b/data/emoticons/static/beer.png
deleted file mode 100644
index 981e9edae..000000000
Binary files a/data/emoticons/static/beer.png and /dev/null differ
diff --git a/data/emoticons/static/biggrin.png b/data/emoticons/static/biggrin.png
deleted file mode 100644
index 8522f2ca8..000000000
Binary files a/data/emoticons/static/biggrin.png and /dev/null differ
diff --git a/data/emoticons/static/blush.png b/data/emoticons/static/blush.png
deleted file mode 100644
index ddb74f251..000000000
Binary files a/data/emoticons/static/blush.png and /dev/null differ
diff --git a/data/emoticons/static/boy.png b/data/emoticons/static/boy.png
deleted file mode 100644
index 022a8b4f8..000000000
Binary files a/data/emoticons/static/boy.png and /dev/null differ
diff --git a/data/emoticons/static/brflower.png b/data/emoticons/static/brflower.png
deleted file mode 100644
index a748127be..000000000
Binary files a/data/emoticons/static/brflower.png and /dev/null differ
diff --git a/data/emoticons/static/brheart.png b/data/emoticons/static/brheart.png
deleted file mode 100644
index 5665d6c18..000000000
Binary files a/data/emoticons/static/brheart.png and /dev/null differ
diff --git a/data/emoticons/static/coffee.png b/data/emoticons/static/coffee.png
deleted file mode 100644
index d206616c5..000000000
Binary files a/data/emoticons/static/coffee.png and /dev/null differ
diff --git a/data/emoticons/static/coolglasses.png b/data/emoticons/static/coolglasses.png
deleted file mode 100644
index 0a3c28ec4..000000000
Binary files a/data/emoticons/static/coolglasses.png and /dev/null differ
diff --git a/data/emoticons/static/cry.png b/data/emoticons/static/cry.png
deleted file mode 100644
index 0cea7589b..000000000
Binary files a/data/emoticons/static/cry.png and /dev/null differ
diff --git a/data/emoticons/static/cuffs.png b/data/emoticons/static/cuffs.png
deleted file mode 100644
index 5564614fc..000000000
Binary files a/data/emoticons/static/cuffs.png and /dev/null differ
diff --git a/data/emoticons/static/devil.png b/data/emoticons/static/devil.png
deleted file mode 100644
index c20ebf24c..000000000
Binary files a/data/emoticons/static/devil.png and /dev/null differ
diff --git a/data/emoticons/static/drink.png b/data/emoticons/static/drink.png
deleted file mode 100644
index c155737f9..000000000
Binary files a/data/emoticons/static/drink.png and /dev/null differ
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
deleted file mode 100644
index ba51e1852..000000000
--- a/data/emoticons/static/emoticons.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# coding=utf-8
-from collections import OrderedDict
-
-emoticons = OrderedDict((
-    ('smile.png', [':-)', ':)']),
-    ('coolglasses.png', ['8-)', 'B-)', '(H)']),
-    ('wink.png', [';-)', ';)']),
-    ('biggrin.png', [':-D', ':D']),
-    ('unhappy.png', [':-(', ':(']),
-    ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
-    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
-    ('blush.png', [':-$', ':$']),
-    ('angry.png', [':-@', ':@']),
-    ('bat.png', [':-[', ':[']),
-    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
-    ('stare.png', [':-|', ':|']),
-    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
-    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
-    ('oh.png', ['=-O', ':-O', ':O']),
-    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
-    ('lion.png', [':3', '>:3']),
-    ('pussy.png', ['(@)', '=^.^=']),
-    ('cuffs.png', ['(%)']),
-    ('moon.png', ['(S)']),
-    ('lamp.png', ['(I)']),
-    ('music.png', ['(8)']),
-    ('beer.png', ['(B)', '*DRINK*']),
-    ('brflower.png', ['(W)']),
-    ('boy.png', ['(Z)']),
-    ('girl.png', ['(X)']),
-    ('mail.png', ['(E)']),
-    ('thumbdown.png', ['(N)']),
-    ('photo.png', ['(P)']),
-    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
-    ('hugleft.png', ['(})']),
-    ('brheart.png', ['</3', '(U)']),
-    ('flower.png', ['@}->--', '(F)']),
-    ('drink.png', ['(D)']),
-    ('phone.png', ['(T)']),
-    ('coffee.png', ['(C)']),
-    ('hugright.png', ['({)']),
-    ('star.png', ['(*)']),
-    ('rainbow.png', ['(R)']),
-    ('puke.png', [':-!']),
-))
diff --git a/data/emoticons/static/flower.png b/data/emoticons/static/flower.png
deleted file mode 100644
index 601408854..000000000
Binary files a/data/emoticons/static/flower.png and /dev/null differ
diff --git a/data/emoticons/static/frowning.png b/data/emoticons/static/frowning.png
deleted file mode 100644
index 6c31f3ac3..000000000
Binary files a/data/emoticons/static/frowning.png and /dev/null differ
diff --git a/data/emoticons/static/girl.png b/data/emoticons/static/girl.png
deleted file mode 100644
index eed5b808b..000000000
Binary files a/data/emoticons/static/girl.png and /dev/null differ
diff --git a/data/emoticons/static/heart.png b/data/emoticons/static/heart.png
deleted file mode 100644
index 4d2c688c5..000000000
Binary files a/data/emoticons/static/heart.png and /dev/null differ
diff --git a/data/emoticons/static/hugleft.png b/data/emoticons/static/hugleft.png
deleted file mode 100644
index ccce063f7..000000000
Binary files a/data/emoticons/static/hugleft.png and /dev/null differ
diff --git a/data/emoticons/static/hugright.png b/data/emoticons/static/hugright.png
deleted file mode 100644
index fca7a84b2..000000000
Binary files a/data/emoticons/static/hugright.png and /dev/null differ
diff --git a/data/emoticons/static/kiss.png b/data/emoticons/static/kiss.png
deleted file mode 100644
index 9435cdbf4..000000000
Binary files a/data/emoticons/static/kiss.png and /dev/null differ
diff --git a/data/emoticons/static/lamp.png b/data/emoticons/static/lamp.png
deleted file mode 100644
index 38b5e9016..000000000
Binary files a/data/emoticons/static/lamp.png and /dev/null differ
diff --git a/data/emoticons/static/lion.png b/data/emoticons/static/lion.png
deleted file mode 100644
index 0ab9e7d05..000000000
Binary files a/data/emoticons/static/lion.png and /dev/null differ
diff --git a/data/emoticons/static/mail.png b/data/emoticons/static/mail.png
deleted file mode 100644
index 38a1398e4..000000000
Binary files a/data/emoticons/static/mail.png and /dev/null differ
diff --git a/data/emoticons/static/moon.png b/data/emoticons/static/moon.png
deleted file mode 100644
index 858f45f0d..000000000
Binary files a/data/emoticons/static/moon.png and /dev/null differ
diff --git a/data/emoticons/static/music.png b/data/emoticons/static/music.png
deleted file mode 100644
index 56c746496..000000000
Binary files a/data/emoticons/static/music.png and /dev/null differ
diff --git a/data/emoticons/static/oh.png b/data/emoticons/static/oh.png
deleted file mode 100644
index 9f5908959..000000000
Binary files a/data/emoticons/static/oh.png and /dev/null differ
diff --git a/data/emoticons/static/phone.png b/data/emoticons/static/phone.png
deleted file mode 100644
index ff12ecefa..000000000
Binary files a/data/emoticons/static/phone.png and /dev/null differ
diff --git a/data/emoticons/static/photo.png b/data/emoticons/static/photo.png
deleted file mode 100644
index ccd7f39da..000000000
Binary files a/data/emoticons/static/photo.png and /dev/null differ
diff --git a/data/emoticons/static/puke.png b/data/emoticons/static/puke.png
deleted file mode 100644
index 400d7625f..000000000
Binary files a/data/emoticons/static/puke.png and /dev/null differ
diff --git a/data/emoticons/static/pussy.png b/data/emoticons/static/pussy.png
deleted file mode 100644
index c76803b63..000000000
Binary files a/data/emoticons/static/pussy.png and /dev/null differ
diff --git a/data/emoticons/static/rainbow.png b/data/emoticons/static/rainbow.png
deleted file mode 100644
index 156f9e81c..000000000
Binary files a/data/emoticons/static/rainbow.png and /dev/null differ
diff --git a/data/emoticons/static/smile.png b/data/emoticons/static/smile.png
deleted file mode 100644
index 7aec288ef..000000000
Binary files a/data/emoticons/static/smile.png and /dev/null differ
diff --git a/data/emoticons/static/star.png b/data/emoticons/static/star.png
deleted file mode 100644
index feb86bea2..000000000
Binary files a/data/emoticons/static/star.png and /dev/null differ
diff --git a/data/emoticons/static/stare.png b/data/emoticons/static/stare.png
deleted file mode 100644
index cf9aa0b71..000000000
Binary files a/data/emoticons/static/stare.png and /dev/null differ
diff --git a/data/emoticons/static/thumbdown.png b/data/emoticons/static/thumbdown.png
deleted file mode 100644
index 9cffa0fa0..000000000
Binary files a/data/emoticons/static/thumbdown.png and /dev/null differ
diff --git a/data/emoticons/static/thumbup.png b/data/emoticons/static/thumbup.png
deleted file mode 100644
index deb8aa440..000000000
Binary files a/data/emoticons/static/thumbup.png and /dev/null differ
diff --git a/data/emoticons/static/tongue.png b/data/emoticons/static/tongue.png
deleted file mode 100644
index 35b92acda..000000000
Binary files a/data/emoticons/static/tongue.png and /dev/null differ
diff --git a/data/emoticons/static/unhappy.png b/data/emoticons/static/unhappy.png
deleted file mode 100644
index 58f5287cd..000000000
Binary files a/data/emoticons/static/unhappy.png and /dev/null differ
diff --git a/data/emoticons/static/wink.png b/data/emoticons/static/wink.png
deleted file mode 100644
index 48b74b563..000000000
Binary files a/data/emoticons/static/wink.png and /dev/null differ
diff --git a/data/emoticons/tango/alien.png b/data/emoticons/tango/alien.png
deleted file mode 100644
index ca83124f8..000000000
Binary files a/data/emoticons/tango/alien.png and /dev/null differ
diff --git a/data/emoticons/tango/angel.png b/data/emoticons/tango/angel.png
deleted file mode 100644
index ad98a51ca..000000000
Binary files a/data/emoticons/tango/angel.png and /dev/null differ
diff --git a/data/emoticons/tango/arrogant.png b/data/emoticons/tango/arrogant.png
deleted file mode 100644
index 42b85ff14..000000000
Binary files a/data/emoticons/tango/arrogant.png and /dev/null differ
diff --git a/data/emoticons/tango/beer.png b/data/emoticons/tango/beer.png
deleted file mode 100644
index e955770a3..000000000
Binary files a/data/emoticons/tango/beer.png and /dev/null differ
diff --git a/data/emoticons/tango/bomb.png b/data/emoticons/tango/bomb.png
deleted file mode 100644
index 9f28ff03b..000000000
Binary files a/data/emoticons/tango/bomb.png and /dev/null differ
diff --git a/data/emoticons/tango/clap.png b/data/emoticons/tango/clap.png
deleted file mode 100644
index 80b0ae1b2..000000000
Binary files a/data/emoticons/tango/clap.png and /dev/null differ
diff --git a/data/emoticons/tango/confused.png b/data/emoticons/tango/confused.png
deleted file mode 100644
index e1a76fc38..000000000
Binary files a/data/emoticons/tango/confused.png and /dev/null differ
diff --git a/data/emoticons/tango/cowboy.png b/data/emoticons/tango/cowboy.png
deleted file mode 100644
index 35e71afc8..000000000
Binary files a/data/emoticons/tango/cowboy.png and /dev/null differ
diff --git a/data/emoticons/tango/crying.png b/data/emoticons/tango/crying.png
deleted file mode 100644
index 016b82eb5..000000000
Binary files a/data/emoticons/tango/crying.png and /dev/null differ
diff --git a/data/emoticons/tango/curl-lip.png b/data/emoticons/tango/curl-lip.png
deleted file mode 100644
index bf12d34c8..000000000
Binary files a/data/emoticons/tango/curl-lip.png and /dev/null differ
diff --git a/data/emoticons/tango/cute.png b/data/emoticons/tango/cute.png
deleted file mode 100644
index ca6b4018a..000000000
Binary files a/data/emoticons/tango/cute.png and /dev/null differ
diff --git a/data/emoticons/tango/dance.png b/data/emoticons/tango/dance.png
deleted file mode 100644
index 709701d9b..000000000
Binary files a/data/emoticons/tango/dance.png and /dev/null differ
diff --git a/data/emoticons/tango/devil.png b/data/emoticons/tango/devil.png
deleted file mode 100644
index 3e043d07b..000000000
Binary files a/data/emoticons/tango/devil.png and /dev/null differ
diff --git a/data/emoticons/tango/disapointed.png b/data/emoticons/tango/disapointed.png
deleted file mode 100644
index b2aced9a3..000000000
Binary files a/data/emoticons/tango/disapointed.png and /dev/null differ
diff --git a/data/emoticons/tango/doh.png b/data/emoticons/tango/doh.png
deleted file mode 100644
index d5cd84cc8..000000000
Binary files a/data/emoticons/tango/doh.png and /dev/null differ
diff --git a/data/emoticons/tango/dont-know.png b/data/emoticons/tango/dont-know.png
deleted file mode 100644
index df2b647ca..000000000
Binary files a/data/emoticons/tango/dont-know.png and /dev/null differ
diff --git a/data/emoticons/tango/embarrassed.png b/data/emoticons/tango/embarrassed.png
deleted file mode 100644
index 93c1c2624..000000000
Binary files a/data/emoticons/tango/embarrassed.png and /dev/null differ
diff --git a/data/emoticons/tango/emoticons.py b/data/emoticons/tango/emoticons.py
deleted file mode 100644
index 3773ec32b..000000000
--- a/data/emoticons/tango/emoticons.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# coding=utf-8
-from collections import OrderedDict
-
-emoticons = OrderedDict((
-    ('angel.png', ['O:-)', 'o:-)', '0:-)']),
-    ('curl-lip.png', [':-)', ':)', '=)']),
-    ('sarcastic.png', [';D', ';-D']),
-    ('sad.png', [':-(', ':(', '=(']),
-    ('wink.png', [';-)', ';)']),
-    ('tongue.png', [':-P', ':P', ':-p', ':p']),
-    ('glasses-cool', ['8-)', 'B-)', '(H)']),
-    ('laugh.png', [':-D', ':D']),
-    ('embarrassed.png', [':-[', ':[']),
-    ('shout.png', ['=-O', ':-O', ':O']),
-    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
-    ('crying.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
-    ('shut-mouth', [':-X']),
-    ('hypnotized.png', ['%)', '%-)']),
-    ('freaked-out.png', [':o']),
-    ('thinking.png', [':-|', ':|']),
-    ('arrogant.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
-    ('devil.png', [':->', ']:->', '>:-)', '>:)', '(6)']),
-    ('musical-note.png', ['[:-}']),
-    ('sick.png', [':-!']),
-    ('giggle.png', ['*JOKINGLY*']),
-    ('cute.png', ['*KISSED*']),
-    ('sleepy.png', ['*TIRED*']),
-    ('terror.png', ['*STOP*']),
-    ('handshake.png', ['*KISSING*']),
-    ('rose.png', ['@}->--', '(F)']),
-    ('good.png', ['(Y)', '*THUMBS UP*']),
-    ('beer.png', ['(B)', '*DRINK*']),
-    ('love.png', ['<3', '(L)', '*IN LOVE*']),
-    ('bomb.png', ['@=']),
-    ('question.png', ['*HELP*']),
-    ('cowboy.png', ['\m/']),
-    ('fingers-crossed.png', ['*OK*']),
-    ('alien.png', ['*WASSUP*']),
-    ('disapointed.png', ['*SORRY*']),
-    ('clap.png', ['*BRAVO*']),
-    ('rotfl.png', ['*ROFL*']),
-    ('dont-know.png', ['*PARDON*']),
-    ('confused.png', ['*NO*']),
-    ('silly.png', ['*CRAZY*']),
-    ('doh.png', ['*DONT_KNOW*']),
-    ('party.png', ['*DANCE*']),
-    ('dance.png', ['*YAHOO*']),
-    ('victory.png', ['*HI*']),
-    ('go-away.png', ['*BYE*']),
-    ('smirk.png', ['*YES*']),
-    ('pissed-off.png', ['*WALL*']),
-    ('mail.png', ['*WRITE*', '(E)']),
-    ('tremble.png', ['*SCRATCH*']),
-))
diff --git a/data/emoticons/tango/fingers-crossed.png b/data/emoticons/tango/fingers-crossed.png
deleted file mode 100644
index 6494707c5..000000000
Binary files a/data/emoticons/tango/fingers-crossed.png and /dev/null differ
diff --git a/data/emoticons/tango/freaked-out.png b/data/emoticons/tango/freaked-out.png
deleted file mode 100644
index 3bb6d58e5..000000000
Binary files a/data/emoticons/tango/freaked-out.png and /dev/null differ
diff --git a/data/emoticons/tango/giggle.png b/data/emoticons/tango/giggle.png
deleted file mode 100644
index e583178f6..000000000
Binary files a/data/emoticons/tango/giggle.png and /dev/null differ
diff --git a/data/emoticons/tango/glasses-cool.png b/data/emoticons/tango/glasses-cool.png
deleted file mode 100644
index 6fdb5fe85..000000000
Binary files a/data/emoticons/tango/glasses-cool.png and /dev/null differ
diff --git a/data/emoticons/tango/go-away.png b/data/emoticons/tango/go-away.png
deleted file mode 100644
index efc98af5a..000000000
Binary files a/data/emoticons/tango/go-away.png and /dev/null differ
diff --git a/data/emoticons/tango/good.png b/data/emoticons/tango/good.png
deleted file mode 100644
index 127d07313..000000000
Binary files a/data/emoticons/tango/good.png and /dev/null differ
diff --git a/data/emoticons/tango/handshake.png b/data/emoticons/tango/handshake.png
deleted file mode 100644
index 5c6d6a531..000000000
Binary files a/data/emoticons/tango/handshake.png and /dev/null differ
diff --git a/data/emoticons/tango/hypnotized.png b/data/emoticons/tango/hypnotized.png
deleted file mode 100644
index 62823ce72..000000000
Binary files a/data/emoticons/tango/hypnotized.png and /dev/null differ
diff --git a/data/emoticons/tango/kiss.png b/data/emoticons/tango/kiss.png
deleted file mode 100644
index 8d0d2e8b1..000000000
Binary files a/data/emoticons/tango/kiss.png and /dev/null differ
diff --git a/data/emoticons/tango/laugh.png b/data/emoticons/tango/laugh.png
deleted file mode 100644
index fdb4f50c0..000000000
Binary files a/data/emoticons/tango/laugh.png and /dev/null differ
diff --git a/data/emoticons/tango/love.png b/data/emoticons/tango/love.png
deleted file mode 100644
index 5171deed6..000000000
Binary files a/data/emoticons/tango/love.png and /dev/null differ
diff --git a/data/emoticons/tango/mail.png b/data/emoticons/tango/mail.png
deleted file mode 100644
index 027bdb090..000000000
Binary files a/data/emoticons/tango/mail.png and /dev/null differ
diff --git a/data/emoticons/tango/musical-note.png b/data/emoticons/tango/musical-note.png
deleted file mode 100644
index 5990ae544..000000000
Binary files a/data/emoticons/tango/musical-note.png and /dev/null differ
diff --git a/data/emoticons/tango/party.png b/data/emoticons/tango/party.png
deleted file mode 100644
index bcc7a4ffe..000000000
Binary files a/data/emoticons/tango/party.png and /dev/null differ
diff --git a/data/emoticons/tango/pissed-off.png b/data/emoticons/tango/pissed-off.png
deleted file mode 100644
index a1c8c8c64..000000000
Binary files a/data/emoticons/tango/pissed-off.png and /dev/null differ
diff --git a/data/emoticons/tango/question.png b/data/emoticons/tango/question.png
deleted file mode 100644
index fc657b46a..000000000
Binary files a/data/emoticons/tango/question.png and /dev/null differ
diff --git a/data/emoticons/tango/rose.png b/data/emoticons/tango/rose.png
deleted file mode 100644
index ff7180ed3..000000000
Binary files a/data/emoticons/tango/rose.png and /dev/null differ
diff --git a/data/emoticons/tango/rotfl.png b/data/emoticons/tango/rotfl.png
deleted file mode 100644
index 9f985a2e6..000000000
Binary files a/data/emoticons/tango/rotfl.png and /dev/null differ
diff --git a/data/emoticons/tango/sad.png b/data/emoticons/tango/sad.png
deleted file mode 100644
index 643fd4379..000000000
Binary files a/data/emoticons/tango/sad.png and /dev/null differ
diff --git a/data/emoticons/tango/sarcastic.png b/data/emoticons/tango/sarcastic.png
deleted file mode 100644
index ece6dd522..000000000
Binary files a/data/emoticons/tango/sarcastic.png and /dev/null differ
diff --git a/data/emoticons/tango/shout.png b/data/emoticons/tango/shout.png
deleted file mode 100644
index c7aa7a9d7..000000000
Binary files a/data/emoticons/tango/shout.png and /dev/null differ
diff --git a/data/emoticons/tango/shut-mouth.png b/data/emoticons/tango/shut-mouth.png
deleted file mode 100644
index c98a29780..000000000
Binary files a/data/emoticons/tango/shut-mouth.png and /dev/null differ
diff --git a/data/emoticons/tango/sick.png b/data/emoticons/tango/sick.png
deleted file mode 100644
index 777e6fd84..000000000
Binary files a/data/emoticons/tango/sick.png and /dev/null differ
diff --git a/data/emoticons/tango/silly.png b/data/emoticons/tango/silly.png
deleted file mode 100644
index b944b7e9f..000000000
Binary files a/data/emoticons/tango/silly.png and /dev/null differ
diff --git a/data/emoticons/tango/sleepy.png b/data/emoticons/tango/sleepy.png
deleted file mode 100644
index 25449039c..000000000
Binary files a/data/emoticons/tango/sleepy.png and /dev/null differ
diff --git a/data/emoticons/tango/smirk.png b/data/emoticons/tango/smirk.png
deleted file mode 100644
index 77e97ee5c..000000000
Binary files a/data/emoticons/tango/smirk.png and /dev/null differ
diff --git a/data/emoticons/tango/terror.png b/data/emoticons/tango/terror.png
deleted file mode 100644
index 104d01252..000000000
Binary files a/data/emoticons/tango/terror.png and /dev/null differ
diff --git a/data/emoticons/tango/thinking.png b/data/emoticons/tango/thinking.png
deleted file mode 100644
index 9d1d752b1..000000000
Binary files a/data/emoticons/tango/thinking.png and /dev/null differ
diff --git a/data/emoticons/tango/tongue.png b/data/emoticons/tango/tongue.png
deleted file mode 100644
index 144318dd1..000000000
Binary files a/data/emoticons/tango/tongue.png and /dev/null differ
diff --git a/data/emoticons/tango/tremble.png b/data/emoticons/tango/tremble.png
deleted file mode 100644
index 3a39e8796..000000000
Binary files a/data/emoticons/tango/tremble.png and /dev/null differ
diff --git a/data/emoticons/tango/victory.png b/data/emoticons/tango/victory.png
deleted file mode 100644
index d0b635e9b..000000000
Binary files a/data/emoticons/tango/victory.png and /dev/null differ
diff --git a/data/emoticons/tango/wink.png b/data/emoticons/tango/wink.png
deleted file mode 100644
index 662baa8ce..000000000
Binary files a/data/emoticons/tango/wink.png and /dev/null differ