diff --git a/README b/README
index 8edbfcee2..d9199d6e4 100644
--- a/README
+++ b/README
@@ -82,6 +82,6 @@ http://gajim.org
 
 PS.
 we use original art and parts of sounds and other art from Psi, Gossip,
-Gnomebaker and some icons from various gnome-icons (mostly Dropline Etiquette)
-we found at art.gnome.org
+Gnomebaker, Gaim and some icons from various gnome-icons
+(mostly Dropline Etiquette) we found at art.gnome.org
 If you think we're violating a license please inform us
diff --git a/data/emoticons/animated/cigarette.gif b/data/emoticons/animated/cigarette.gif
new file mode 100644
index 000000000..8e238a490
Binary files /dev/null and b/data/emoticons/animated/cigarette.gif differ
diff --git a/data/emoticons/animated/dontknow.gif b/data/emoticons/animated/dontknow.gif
new file mode 100644
index 000000000..5934a4305
Binary files /dev/null and b/data/emoticons/animated/dontknow.gif differ
diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index f764b555c..74f0cef7c 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -1,2 +1,67 @@
 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',
+	'(ci)': 'msn_cigarette.gif',
 }
+