diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
new file mode 100644
index 000000000..f764b555c
--- /dev/null
+++ b/data/emoticons/animated/emoticons.py
@@ -0,0 +1,2 @@
+emoticons = {
+}
diff --git a/data/emoticons/angry.png b/data/emoticons/static/angry.png
similarity index 100%
rename from data/emoticons/angry.png
rename to data/emoticons/static/angry.png
diff --git a/data/emoticons/bat.png b/data/emoticons/static/bat.png
similarity index 100%
rename from data/emoticons/bat.png
rename to data/emoticons/static/bat.png
diff --git a/data/emoticons/beer.png b/data/emoticons/static/beer.png
similarity index 100%
rename from data/emoticons/beer.png
rename to data/emoticons/static/beer.png
diff --git a/data/emoticons/biggrin.png b/data/emoticons/static/biggrin.png
similarity index 100%
rename from data/emoticons/biggrin.png
rename to data/emoticons/static/biggrin.png
diff --git a/data/emoticons/blush.png b/data/emoticons/static/blush.png
similarity index 100%
rename from data/emoticons/blush.png
rename to data/emoticons/static/blush.png
diff --git a/data/emoticons/boy.png b/data/emoticons/static/boy.png
similarity index 100%
rename from data/emoticons/boy.png
rename to data/emoticons/static/boy.png
diff --git a/data/emoticons/brflower.png b/data/emoticons/static/brflower.png
similarity index 100%
rename from data/emoticons/brflower.png
rename to data/emoticons/static/brflower.png
diff --git a/data/emoticons/brheart.png b/data/emoticons/static/brheart.png
similarity index 100%
rename from data/emoticons/brheart.png
rename to data/emoticons/static/brheart.png
diff --git a/data/emoticons/coffee.png b/data/emoticons/static/coffee.png
similarity index 100%
rename from data/emoticons/coffee.png
rename to data/emoticons/static/coffee.png
diff --git a/data/emoticons/coolglasses.png b/data/emoticons/static/coolglasses.png
similarity index 100%
rename from data/emoticons/coolglasses.png
rename to data/emoticons/static/coolglasses.png
diff --git a/data/emoticons/cry.png b/data/emoticons/static/cry.png
similarity index 100%
rename from data/emoticons/cry.png
rename to data/emoticons/static/cry.png
diff --git a/data/emoticons/cuffs.png b/data/emoticons/static/cuffs.png
similarity index 100%
rename from data/emoticons/cuffs.png
rename to data/emoticons/static/cuffs.png
diff --git a/data/emoticons/devil.png b/data/emoticons/static/devil.png
similarity index 100%
rename from data/emoticons/devil.png
rename to data/emoticons/static/devil.png
diff --git a/data/emoticons/drink.png b/data/emoticons/static/drink.png
similarity index 100%
rename from data/emoticons/drink.png
rename to data/emoticons/static/drink.png
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
new file mode 100644
index 000000000..aba1819b7
--- /dev/null
+++ b/data/emoticons/static/emoticons.py
@@ -0,0 +1,65 @@
+emoticons = {
+	':-)': 'smile.png',
+	'(@)': 'pussy.png',
+	'8)': 'coolglasses.png',
+	':(': 'unhappy.png',
+	':)': 'smile.png',
+	':/': 'frowning.png',
+	'(})': 'hugleft.png',
+	':$': 'blush.png',
+	'(Y)': 'yes.png',
+	':-@': 'angry.png',
+	':-D': 'biggrin.png',
+	'(U)': 'brheart.png',
+	'(F)': 'flower.png',
+	':-[': 'bat.png',
+	':>': 'biggrin.png',
+	'(T)': 'phone.png',
+	':-S': 'frowning.png',
+	':-P': 'tongue.png',
+	'(H)': 'coolglasses.png',
+	'(D)': 'drink.png',
+	':-O': 'oh.png',
+	'(C)': 'coffee.png',
+	'({)': 'hugright.png',
+	'(*)': 'star.png',
+	'B-)': 'coolglasses.png',
+	'(Z)': 'boy.png',
+	'(E)': 'mail.png',
+	'(N)': 'no.png',
+	'(P)': 'photo.png',
+	'(K)': 'kiss.png',
+	':-*': 'kiss.png',
+	':*': 'kiss.png',
+	'(R)': 'rainbow.png',
+	':-|': 'stare.png',
+	';-)': 'wink.png',
+	';-(': 'cry.png',
+	'(6)': 'devil.png',
+	'>:)': 'devil.png',
+	'>:-)': 'devil.png',
+	'(L)': 'heart.png',
+	'<3': 'heart.png',
+	'(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',
+	':D': 'biggrin.png',
+	'(8)': 'music.png',
+	':@': 'angry.png',
+	'B)': 'coolglasses.png',
+	':-$': 'blush.png',
+	':\'(': 'cry.png',
+	':->': 'biggrin.png',
+	':[': 'bat.png',
+	'(I)': 'lamp.png',
+	':P': 'tongue.png',
+	'(%)': 'cuffs.png',
+	'(S)': 'moon.png',
+}
diff --git a/data/emoticons/flower.png b/data/emoticons/static/flower.png
similarity index 100%
rename from data/emoticons/flower.png
rename to data/emoticons/static/flower.png
diff --git a/data/emoticons/frowning.png b/data/emoticons/static/frowning.png
similarity index 100%
rename from data/emoticons/frowning.png
rename to data/emoticons/static/frowning.png
diff --git a/data/emoticons/girl.png b/data/emoticons/static/girl.png
similarity index 100%
rename from data/emoticons/girl.png
rename to data/emoticons/static/girl.png
diff --git a/data/emoticons/heart.png b/data/emoticons/static/heart.png
similarity index 100%
rename from data/emoticons/heart.png
rename to data/emoticons/static/heart.png
diff --git a/data/emoticons/hugleft.png b/data/emoticons/static/hugleft.png
similarity index 100%
rename from data/emoticons/hugleft.png
rename to data/emoticons/static/hugleft.png
diff --git a/data/emoticons/hugright.png b/data/emoticons/static/hugright.png
similarity index 100%
rename from data/emoticons/hugright.png
rename to data/emoticons/static/hugright.png
diff --git a/data/emoticons/kiss.png b/data/emoticons/static/kiss.png
similarity index 100%
rename from data/emoticons/kiss.png
rename to data/emoticons/static/kiss.png
diff --git a/data/emoticons/lamp.png b/data/emoticons/static/lamp.png
similarity index 100%
rename from data/emoticons/lamp.png
rename to data/emoticons/static/lamp.png
diff --git a/data/emoticons/mail.png b/data/emoticons/static/mail.png
similarity index 100%
rename from data/emoticons/mail.png
rename to data/emoticons/static/mail.png
diff --git a/data/emoticons/moon.png b/data/emoticons/static/moon.png
similarity index 100%
rename from data/emoticons/moon.png
rename to data/emoticons/static/moon.png
diff --git a/data/emoticons/music.png b/data/emoticons/static/music.png
similarity index 100%
rename from data/emoticons/music.png
rename to data/emoticons/static/music.png
diff --git a/data/emoticons/no.png b/data/emoticons/static/no.png
similarity index 100%
rename from data/emoticons/no.png
rename to data/emoticons/static/no.png
diff --git a/data/emoticons/oh.png b/data/emoticons/static/oh.png
similarity index 100%
rename from data/emoticons/oh.png
rename to data/emoticons/static/oh.png
diff --git a/data/emoticons/phone.png b/data/emoticons/static/phone.png
similarity index 100%
rename from data/emoticons/phone.png
rename to data/emoticons/static/phone.png
diff --git a/data/emoticons/photo.png b/data/emoticons/static/photo.png
similarity index 100%
rename from data/emoticons/photo.png
rename to data/emoticons/static/photo.png
diff --git a/data/emoticons/pussy.png b/data/emoticons/static/pussy.png
similarity index 100%
rename from data/emoticons/pussy.png
rename to data/emoticons/static/pussy.png
diff --git a/data/emoticons/rainbow.png b/data/emoticons/static/rainbow.png
similarity index 100%
rename from data/emoticons/rainbow.png
rename to data/emoticons/static/rainbow.png
diff --git a/data/emoticons/smile.png b/data/emoticons/static/smile.png
similarity index 100%
rename from data/emoticons/smile.png
rename to data/emoticons/static/smile.png
diff --git a/data/emoticons/star.png b/data/emoticons/static/star.png
similarity index 100%
rename from data/emoticons/star.png
rename to data/emoticons/static/star.png
diff --git a/data/emoticons/stare.png b/data/emoticons/static/stare.png
similarity index 100%
rename from data/emoticons/stare.png
rename to data/emoticons/static/stare.png
diff --git a/data/emoticons/tongue.png b/data/emoticons/static/tongue.png
similarity index 100%
rename from data/emoticons/tongue.png
rename to data/emoticons/static/tongue.png
diff --git a/data/emoticons/unhappy.png b/data/emoticons/static/unhappy.png
similarity index 100%
rename from data/emoticons/unhappy.png
rename to data/emoticons/static/unhappy.png
diff --git a/data/emoticons/wink.png b/data/emoticons/static/wink.png
similarity index 100%
rename from data/emoticons/wink.png
rename to data/emoticons/static/wink.png
diff --git a/data/emoticons/yes.png b/data/emoticons/static/yes.png
similarity index 100%
rename from data/emoticons/yes.png
rename to data/emoticons/static/yes.png