diff --git a/data/emoticons/animated/angry.png b/data/emoticons/animated/angry.png
new file mode 100644
index 000000000..22e285d6b
Binary files /dev/null and b/data/emoticons/animated/angry.png differ
diff --git a/data/emoticons/animated/bat.gif b/data/emoticons/animated/bat.gif
new file mode 100644
index 000000000..b77fa2ddf
Binary files /dev/null and b/data/emoticons/animated/bat.gif differ
diff --git a/data/emoticons/animated/beer.png b/data/emoticons/animated/beer.png
new file mode 100644
index 000000000..40429c460
Binary files /dev/null and b/data/emoticons/animated/beer.png differ
diff --git a/data/emoticons/animated/biggrin.png b/data/emoticons/animated/biggrin.png
new file mode 100644
index 000000000..b8fe847bd
Binary files /dev/null and b/data/emoticons/animated/biggrin.png differ
diff --git a/data/emoticons/animated/blush.png b/data/emoticons/animated/blush.png
new file mode 100644
index 000000000..45da0bada
Binary files /dev/null and b/data/emoticons/animated/blush.png differ
diff --git a/data/emoticons/animated/boy.png b/data/emoticons/animated/boy.png
new file mode 100644
index 000000000..0580417d1
Binary files /dev/null and b/data/emoticons/animated/boy.png differ
diff --git a/data/emoticons/animated/brflower.png b/data/emoticons/animated/brflower.png
new file mode 100644
index 000000000..2e01d94ee
Binary files /dev/null and b/data/emoticons/animated/brflower.png differ
diff --git a/data/emoticons/animated/brheart.png b/data/emoticons/animated/brheart.png
new file mode 100644
index 000000000..3fb8d8647
Binary files /dev/null and b/data/emoticons/animated/brheart.png differ
diff --git a/data/emoticons/animated/cake.gif b/data/emoticons/animated/cake.gif
new file mode 100644
index 000000000..5b81ca7fa
Binary files /dev/null and b/data/emoticons/animated/cake.gif differ
diff --git a/data/emoticons/animated/coffee.png b/data/emoticons/animated/coffee.png
new file mode 100644
index 000000000..2890fe5f7
Binary files /dev/null and b/data/emoticons/animated/coffee.png differ
diff --git a/data/emoticons/animated/coolglasses.png b/data/emoticons/animated/coolglasses.png
new file mode 100644
index 000000000..e75c32d92
Binary files /dev/null and b/data/emoticons/animated/coolglasses.png differ
diff --git a/data/emoticons/animated/cry.gif b/data/emoticons/animated/cry.gif
new file mode 100644
index 000000000..dbd2f5acf
Binary files /dev/null and b/data/emoticons/animated/cry.gif differ
diff --git a/data/emoticons/animated/cuffs.png b/data/emoticons/animated/cuffs.png
new file mode 100644
index 000000000..778352d13
Binary files /dev/null and b/data/emoticons/animated/cuffs.png differ
diff --git a/data/emoticons/animated/devil.png b/data/emoticons/animated/devil.png
new file mode 100644
index 000000000..d5eb500f0
Binary files /dev/null and b/data/emoticons/animated/devil.png differ
diff --git a/data/emoticons/animated/drink.png b/data/emoticons/animated/drink.png
new file mode 100644
index 000000000..3fbd34619
Binary files /dev/null and b/data/emoticons/animated/drink.png differ
diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index 74f0cef7c..364d925a2 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -1,4 +1,19 @@
 emoticons = {
+	':-[': 'bat.gif',
+	':[': 'bat.gif',
+	'(ci)': 'cigarette.gif',
+	'(^)': 'cake.gif',
+	":'(": 'cry.gif',
+	';(': 'cry.gif',
+	':^)': 'dontknow.gif',
+	'8-)': 'eyeroll.gif',
+	'(li)': 'lightning.gif',
+	'<:o)': 'party.gif',
+	'|-)': 'sleepy.gif',
+	'*-)': 'think.gif',
+	';)': 'wink.gif',
+	';-)': 'wink.gif',
+	# now static (only those that don't have animated)
 	':-)': 'smile.png',
 	'(@)': 'pussy.png',
 	'8)': 'coolglasses.png',
@@ -12,7 +27,6 @@ emoticons = {
 	':-D': 'biggrin.png',
 	'(U)': 'brheart.png',
 	'(F)': 'flower.png',
-	':-[': 'bat.png',
 	':>': 'biggrin.png',
 	'(T)': 'phone.png',
 	':-S': 'frowning.png',
@@ -33,8 +47,6 @@ emoticons = {
 	':*': 'kiss.png',
 	'(R)': 'rainbow.png',
 	':-|': 'stare.png',
-	';-)': 'wink.png',
-	';-(': 'cry.png',
 	'(6)': 'devil.png',
 	'>:)': 'devil.png',
 	'>:-)': 'devil.png',
@@ -43,10 +55,7 @@ emoticons = {
 	'(W)': 'brflower.png',
 	':|': 'stare.png',
 	':O': 'oh.png',
-	';)': 'wink.png',
-	';(': 'cry.png',
 	':S': 'frowning.png',
-	';\'-(': 'cry.png',
 	':-(': 'unhappy.png',
 	'8-)': 'coolglasses.png',
 	'(B)': 'beer.png',
@@ -55,13 +64,10 @@ emoticons = {
 	':@': 'angry.png',
 	'B)': 'coolglasses.png',
 	':-$': 'blush.png',
-	':\'(': 'cry.png',
 	':->': 'biggrin.png',
-	':[': 'bat.png',
 	'(I)': 'lamp.png',
 	':P': 'tongue.png',
 	'(%)': 'cuffs.png',
 	'(S)': 'moon.png',
-	'(ci)': 'msn_cigarette.gif',
 }
 
diff --git a/data/emoticons/animated/eyeroll.gif b/data/emoticons/animated/eyeroll.gif
new file mode 100644
index 000000000..559cdd3f3
Binary files /dev/null and b/data/emoticons/animated/eyeroll.gif differ
diff --git a/data/emoticons/animated/flower.png b/data/emoticons/animated/flower.png
new file mode 100644
index 000000000..6151ff5aa
Binary files /dev/null and b/data/emoticons/animated/flower.png differ
diff --git a/data/emoticons/animated/frowning.png b/data/emoticons/animated/frowning.png
new file mode 100644
index 000000000..53f903d38
Binary files /dev/null and b/data/emoticons/animated/frowning.png differ
diff --git a/data/emoticons/animated/girl.png b/data/emoticons/animated/girl.png
new file mode 100644
index 000000000..1a13b2680
Binary files /dev/null and b/data/emoticons/animated/girl.png differ
diff --git a/data/emoticons/animated/heart.png b/data/emoticons/animated/heart.png
new file mode 100644
index 000000000..5ee5bdd0d
Binary files /dev/null and b/data/emoticons/animated/heart.png differ
diff --git a/data/emoticons/animated/hugleft.png b/data/emoticons/animated/hugleft.png
new file mode 100644
index 000000000..fcc4c79e8
Binary files /dev/null and b/data/emoticons/animated/hugleft.png differ
diff --git a/data/emoticons/animated/hugright.png b/data/emoticons/animated/hugright.png
new file mode 100644
index 000000000..a0f415da7
Binary files /dev/null and b/data/emoticons/animated/hugright.png differ
diff --git a/data/emoticons/animated/kiss.png b/data/emoticons/animated/kiss.png
new file mode 100644
index 000000000..fde59bcab
Binary files /dev/null and b/data/emoticons/animated/kiss.png differ
diff --git a/data/emoticons/animated/lamp.png b/data/emoticons/animated/lamp.png
new file mode 100644
index 000000000..3d3211646
Binary files /dev/null and b/data/emoticons/animated/lamp.png differ
diff --git a/data/emoticons/animated/lightning.gif b/data/emoticons/animated/lightning.gif
new file mode 100644
index 000000000..4f69f0f03
Binary files /dev/null and b/data/emoticons/animated/lightning.gif differ
diff --git a/data/emoticons/animated/mail.png b/data/emoticons/animated/mail.png
new file mode 100644
index 000000000..9ea1b53b9
Binary files /dev/null and b/data/emoticons/animated/mail.png differ
diff --git a/data/emoticons/animated/moon.png b/data/emoticons/animated/moon.png
new file mode 100644
index 000000000..622f0bf06
Binary files /dev/null and b/data/emoticons/animated/moon.png differ
diff --git a/data/emoticons/animated/music.png b/data/emoticons/animated/music.png
new file mode 100644
index 000000000..65099240f
Binary files /dev/null and b/data/emoticons/animated/music.png differ
diff --git a/data/emoticons/animated/no.png b/data/emoticons/animated/no.png
new file mode 100644
index 000000000..5f9a11b75
Binary files /dev/null and b/data/emoticons/animated/no.png differ
diff --git a/data/emoticons/animated/oh.png b/data/emoticons/animated/oh.png
new file mode 100644
index 000000000..7e9bb50d0
Binary files /dev/null and b/data/emoticons/animated/oh.png differ
diff --git a/data/emoticons/animated/party.gif b/data/emoticons/animated/party.gif
new file mode 100644
index 000000000..9336aabd5
Binary files /dev/null and b/data/emoticons/animated/party.gif differ
diff --git a/data/emoticons/animated/phone.png b/data/emoticons/animated/phone.png
new file mode 100644
index 000000000..19eb086dc
Binary files /dev/null and b/data/emoticons/animated/phone.png differ
diff --git a/data/emoticons/animated/photo.png b/data/emoticons/animated/photo.png
new file mode 100644
index 000000000..0e1e607ef
Binary files /dev/null and b/data/emoticons/animated/photo.png differ
diff --git a/data/emoticons/animated/pussy.png b/data/emoticons/animated/pussy.png
new file mode 100644
index 000000000..3b1473e08
Binary files /dev/null and b/data/emoticons/animated/pussy.png differ
diff --git a/data/emoticons/animated/rainbow.png b/data/emoticons/animated/rainbow.png
new file mode 100644
index 000000000..9e2612ba6
Binary files /dev/null and b/data/emoticons/animated/rainbow.png differ
diff --git a/data/emoticons/animated/sleepy.gif b/data/emoticons/animated/sleepy.gif
new file mode 100644
index 000000000..6eaf9233f
Binary files /dev/null and b/data/emoticons/animated/sleepy.gif differ
diff --git a/data/emoticons/animated/smile.png b/data/emoticons/animated/smile.png
new file mode 100644
index 000000000..807958244
Binary files /dev/null and b/data/emoticons/animated/smile.png differ
diff --git a/data/emoticons/animated/star.png b/data/emoticons/animated/star.png
new file mode 100644
index 000000000..bcd32d4ac
Binary files /dev/null and b/data/emoticons/animated/star.png differ
diff --git a/data/emoticons/animated/stare.png b/data/emoticons/animated/stare.png
new file mode 100644
index 000000000..db0e1f977
Binary files /dev/null and b/data/emoticons/animated/stare.png differ
diff --git a/data/emoticons/animated/think.gif b/data/emoticons/animated/think.gif
new file mode 100644
index 000000000..63750f7e3
Binary files /dev/null and b/data/emoticons/animated/think.gif differ
diff --git a/data/emoticons/animated/tongue.png b/data/emoticons/animated/tongue.png
new file mode 100644
index 000000000..89150cf51
Binary files /dev/null and b/data/emoticons/animated/tongue.png differ
diff --git a/data/emoticons/animated/unhappy.png b/data/emoticons/animated/unhappy.png
new file mode 100644
index 000000000..f8812d06d
Binary files /dev/null and b/data/emoticons/animated/unhappy.png differ
diff --git a/data/emoticons/animated/wink.gif b/data/emoticons/animated/wink.gif
new file mode 100644
index 000000000..fc95fad49
Binary files /dev/null and b/data/emoticons/animated/wink.gif differ
diff --git a/data/emoticons/animated/yes.png b/data/emoticons/animated/yes.png
new file mode 100644
index 000000000..6d85949b2
Binary files /dev/null and b/data/emoticons/animated/yes.png differ