diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index 925eddbd7..d687d15ce 100644
--- a/data/emoticons/static/emoticons.py
+++ b/data/emoticons/static/emoticons.py
@@ -12,6 +12,7 @@ emoticons = {
 	':->': 'biggrin.png',
 	':D': 'biggrin.png',
 	':>': 'biggrin.png',
+	'xD': 'biggrin.png',	
 #	
 	':-(': 'unhappy.png',
 	':(': 'unhappy.png',
diff --git a/data/emoticons/static/hugleft.png b/data/emoticons/static/hugleft.png
index fcc4c79e8..af59b6757 100644
Binary files a/data/emoticons/static/hugleft.png and b/data/emoticons/static/hugleft.png differ
diff --git a/data/emoticons/static/hugright.png b/data/emoticons/static/hugright.png
index a0f415da7..f059a70a6 100644
Binary files a/data/emoticons/static/hugright.png and b/data/emoticons/static/hugright.png differ
diff --git a/data/emoticons/static/lamp.png b/data/emoticons/static/lamp.png
index 3d3211646..967d3f9c8 100644
Binary files a/data/emoticons/static/lamp.png and b/data/emoticons/static/lamp.png differ
diff --git a/data/emoticons/static/moon.png b/data/emoticons/static/moon.png
index 622f0bf06..d2addeb35 100644
Binary files a/data/emoticons/static/moon.png and b/data/emoticons/static/moon.png differ
diff --git a/data/emoticons/static/no.png b/data/emoticons/static/no.png
index 5f9a11b75..37cd41a56 100644
Binary files a/data/emoticons/static/no.png and b/data/emoticons/static/no.png differ
diff --git a/data/emoticons/static/photo.png b/data/emoticons/static/photo.png
index 0e1e607ef..6e69d3c7b 100644
Binary files a/data/emoticons/static/photo.png and b/data/emoticons/static/photo.png differ
diff --git a/data/emoticons/static/yes.png b/data/emoticons/static/yes.png
index 6d85949b2..61930fe9e 100644
Binary files a/data/emoticons/static/yes.png and b/data/emoticons/static/yes.png differ