diff --git a/THANKS.artists b/THANKS.artists
index 5cdff9134..7f8f24c99 100644
--- a/THANKS.artists
+++ b/THANKS.artists
@@ -1,10 +1,10 @@
 Anders Ström
 Christophe Got
 Dennis Craven
+Dmitry Korzhevin
 Guillaume Morin
 Gvorcek Spajreh
 Josef Vybíral
 Membris Khan
 Rederick Asher
 Jakub Szypulka
-
diff --git a/data/emoticons/tango/alien.png b/data/emoticons/tango/alien.png
new file mode 100644
index 000000000..ca83124f8
Binary files /dev/null and b/data/emoticons/tango/alien.png differ
diff --git a/data/emoticons/tango/angel.png b/data/emoticons/tango/angel.png
new file mode 100644
index 000000000..ad98a51ca
Binary files /dev/null and b/data/emoticons/tango/angel.png differ
diff --git a/data/emoticons/tango/arrogant.png b/data/emoticons/tango/arrogant.png
new file mode 100644
index 000000000..42b85ff14
Binary files /dev/null and b/data/emoticons/tango/arrogant.png differ
diff --git a/data/emoticons/tango/beer.png b/data/emoticons/tango/beer.png
new file mode 100644
index 000000000..e955770a3
Binary files /dev/null and b/data/emoticons/tango/beer.png differ
diff --git a/data/emoticons/tango/bomb.png b/data/emoticons/tango/bomb.png
new file mode 100644
index 000000000..9f28ff03b
Binary files /dev/null and b/data/emoticons/tango/bomb.png differ
diff --git a/data/emoticons/tango/clap.png b/data/emoticons/tango/clap.png
new file mode 100644
index 000000000..80b0ae1b2
Binary files /dev/null and b/data/emoticons/tango/clap.png differ
diff --git a/data/emoticons/tango/confused.png b/data/emoticons/tango/confused.png
new file mode 100644
index 000000000..e1a76fc38
Binary files /dev/null and b/data/emoticons/tango/confused.png differ
diff --git a/data/emoticons/tango/cowboy.png b/data/emoticons/tango/cowboy.png
new file mode 100644
index 000000000..35e71afc8
Binary files /dev/null and b/data/emoticons/tango/cowboy.png differ
diff --git a/data/emoticons/tango/crying.png b/data/emoticons/tango/crying.png
new file mode 100644
index 000000000..016b82eb5
Binary files /dev/null and b/data/emoticons/tango/crying.png differ
diff --git a/data/emoticons/tango/curl-lip.png b/data/emoticons/tango/curl-lip.png
new file mode 100644
index 000000000..bf12d34c8
Binary files /dev/null and b/data/emoticons/tango/curl-lip.png differ
diff --git a/data/emoticons/tango/cute.png b/data/emoticons/tango/cute.png
new file mode 100644
index 000000000..ca6b4018a
Binary files /dev/null and b/data/emoticons/tango/cute.png differ
diff --git a/data/emoticons/tango/dance.png b/data/emoticons/tango/dance.png
new file mode 100644
index 000000000..709701d9b
Binary files /dev/null and b/data/emoticons/tango/dance.png differ
diff --git a/data/emoticons/tango/devil.png b/data/emoticons/tango/devil.png
new file mode 100644
index 000000000..3e043d07b
Binary files /dev/null and b/data/emoticons/tango/devil.png differ
diff --git a/data/emoticons/tango/disapointed.png b/data/emoticons/tango/disapointed.png
new file mode 100644
index 000000000..b2aced9a3
Binary files /dev/null and b/data/emoticons/tango/disapointed.png differ
diff --git a/data/emoticons/tango/doh.png b/data/emoticons/tango/doh.png
new file mode 100644
index 000000000..d5cd84cc8
Binary files /dev/null and b/data/emoticons/tango/doh.png differ
diff --git a/data/emoticons/tango/dont-know.png b/data/emoticons/tango/dont-know.png
new file mode 100644
index 000000000..df2b647ca
Binary files /dev/null and b/data/emoticons/tango/dont-know.png differ
diff --git a/data/emoticons/tango/embarrassed.png b/data/emoticons/tango/embarrassed.png
new file mode 100644
index 000000000..93c1c2624
Binary files /dev/null and b/data/emoticons/tango/embarrassed.png differ
diff --git a/data/emoticons/tango/emoticons.py b/data/emoticons/tango/emoticons.py
new file mode 100644
index 000000000..43c7ce37f
--- /dev/null
+++ b/data/emoticons/tango/emoticons.py
@@ -0,0 +1,52 @@
+# coding=utf-8
+emoticons = {
+        '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*'],
+}
\ No newline at end of file
diff --git a/data/emoticons/tango/fingers-crossed.png b/data/emoticons/tango/fingers-crossed.png
new file mode 100644
index 000000000..6494707c5
Binary files /dev/null and b/data/emoticons/tango/fingers-crossed.png differ
diff --git a/data/emoticons/tango/freaked-out.png b/data/emoticons/tango/freaked-out.png
new file mode 100644
index 000000000..3bb6d58e5
Binary files /dev/null and b/data/emoticons/tango/freaked-out.png differ
diff --git a/data/emoticons/tango/giggle.png b/data/emoticons/tango/giggle.png
new file mode 100644
index 000000000..e583178f6
Binary files /dev/null and b/data/emoticons/tango/giggle.png differ
diff --git a/data/emoticons/tango/glasses-cool.png b/data/emoticons/tango/glasses-cool.png
new file mode 100644
index 000000000..6fdb5fe85
Binary files /dev/null and b/data/emoticons/tango/glasses-cool.png differ
diff --git a/data/emoticons/tango/go-away.png b/data/emoticons/tango/go-away.png
new file mode 100644
index 000000000..efc98af5a
Binary files /dev/null and b/data/emoticons/tango/go-away.png differ
diff --git a/data/emoticons/tango/good.png b/data/emoticons/tango/good.png
new file mode 100644
index 000000000..127d07313
Binary files /dev/null and b/data/emoticons/tango/good.png differ
diff --git a/data/emoticons/tango/handshake.png b/data/emoticons/tango/handshake.png
new file mode 100644
index 000000000..5c6d6a531
Binary files /dev/null and b/data/emoticons/tango/handshake.png differ
diff --git a/data/emoticons/tango/hypnotized.png b/data/emoticons/tango/hypnotized.png
new file mode 100644
index 000000000..62823ce72
Binary files /dev/null and b/data/emoticons/tango/hypnotized.png differ
diff --git a/data/emoticons/tango/kiss.png b/data/emoticons/tango/kiss.png
new file mode 100644
index 000000000..8d0d2e8b1
Binary files /dev/null and b/data/emoticons/tango/kiss.png differ
diff --git a/data/emoticons/tango/laugh.png b/data/emoticons/tango/laugh.png
new file mode 100644
index 000000000..fdb4f50c0
Binary files /dev/null and b/data/emoticons/tango/laugh.png differ
diff --git a/data/emoticons/tango/love.png b/data/emoticons/tango/love.png
new file mode 100644
index 000000000..5171deed6
Binary files /dev/null and b/data/emoticons/tango/love.png differ
diff --git a/data/emoticons/tango/mail.png b/data/emoticons/tango/mail.png
new file mode 100644
index 000000000..027bdb090
Binary files /dev/null and b/data/emoticons/tango/mail.png differ
diff --git a/data/emoticons/tango/musical-note.png b/data/emoticons/tango/musical-note.png
new file mode 100644
index 000000000..5990ae544
Binary files /dev/null and b/data/emoticons/tango/musical-note.png differ
diff --git a/data/emoticons/tango/party.png b/data/emoticons/tango/party.png
new file mode 100644
index 000000000..bcc7a4ffe
Binary files /dev/null and b/data/emoticons/tango/party.png differ
diff --git a/data/emoticons/tango/pissed-off.png b/data/emoticons/tango/pissed-off.png
new file mode 100644
index 000000000..a1c8c8c64
Binary files /dev/null and b/data/emoticons/tango/pissed-off.png differ
diff --git a/data/emoticons/tango/question.png b/data/emoticons/tango/question.png
new file mode 100644
index 000000000..fc657b46a
Binary files /dev/null and b/data/emoticons/tango/question.png differ
diff --git a/data/emoticons/tango/rose.png b/data/emoticons/tango/rose.png
new file mode 100644
index 000000000..ff7180ed3
Binary files /dev/null and b/data/emoticons/tango/rose.png differ
diff --git a/data/emoticons/tango/rotfl.png b/data/emoticons/tango/rotfl.png
new file mode 100644
index 000000000..9f985a2e6
Binary files /dev/null and b/data/emoticons/tango/rotfl.png differ
diff --git a/data/emoticons/tango/sad.png b/data/emoticons/tango/sad.png
new file mode 100644
index 000000000..643fd4379
Binary files /dev/null and b/data/emoticons/tango/sad.png differ
diff --git a/data/emoticons/tango/sarcastic.png b/data/emoticons/tango/sarcastic.png
new file mode 100644
index 000000000..ece6dd522
Binary files /dev/null and b/data/emoticons/tango/sarcastic.png differ
diff --git a/data/emoticons/tango/shout.png b/data/emoticons/tango/shout.png
new file mode 100644
index 000000000..c7aa7a9d7
Binary files /dev/null and b/data/emoticons/tango/shout.png differ
diff --git a/data/emoticons/tango/shut-mouth.png b/data/emoticons/tango/shut-mouth.png
new file mode 100644
index 000000000..c98a29780
Binary files /dev/null and b/data/emoticons/tango/shut-mouth.png differ
diff --git a/data/emoticons/tango/sick.png b/data/emoticons/tango/sick.png
new file mode 100644
index 000000000..777e6fd84
Binary files /dev/null and b/data/emoticons/tango/sick.png differ
diff --git a/data/emoticons/tango/silly.png b/data/emoticons/tango/silly.png
new file mode 100644
index 000000000..b944b7e9f
Binary files /dev/null and b/data/emoticons/tango/silly.png differ
diff --git a/data/emoticons/tango/sleepy.png b/data/emoticons/tango/sleepy.png
new file mode 100644
index 000000000..25449039c
Binary files /dev/null and b/data/emoticons/tango/sleepy.png differ
diff --git a/data/emoticons/tango/smirk.png b/data/emoticons/tango/smirk.png
new file mode 100644
index 000000000..77e97ee5c
Binary files /dev/null and b/data/emoticons/tango/smirk.png differ
diff --git a/data/emoticons/tango/terror.png b/data/emoticons/tango/terror.png
new file mode 100644
index 000000000..104d01252
Binary files /dev/null and b/data/emoticons/tango/terror.png differ
diff --git a/data/emoticons/tango/thinking.png b/data/emoticons/tango/thinking.png
new file mode 100644
index 000000000..9d1d752b1
Binary files /dev/null and b/data/emoticons/tango/thinking.png differ
diff --git a/data/emoticons/tango/tongue.png b/data/emoticons/tango/tongue.png
new file mode 100644
index 000000000..144318dd1
Binary files /dev/null and b/data/emoticons/tango/tongue.png differ
diff --git a/data/emoticons/tango/tremble.png b/data/emoticons/tango/tremble.png
new file mode 100644
index 000000000..3a39e8796
Binary files /dev/null and b/data/emoticons/tango/tremble.png differ
diff --git a/data/emoticons/tango/victory.png b/data/emoticons/tango/victory.png
new file mode 100644
index 000000000..d0b635e9b
Binary files /dev/null and b/data/emoticons/tango/victory.png differ
diff --git a/data/emoticons/tango/wink.png b/data/emoticons/tango/wink.png
new file mode 100644
index 000000000..662baa8ce
Binary files /dev/null and b/data/emoticons/tango/wink.png differ