diff --git a/README.md b/README.md
index c7bfba4..b8ff383 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,19 @@
 
 #### Get Necessary Data:
 + Get /data/data/com.tencent.mm/MicroMsg/long-long-name/EnMicroMsg.db from root filesystem, possible ways are:
-	+ `adb root`, `adb pull /xxx/xxx.db`
+	+ `adb root`, `adb pull /data/data/com.tencent.mm/MicroMsg/long-long-name/EnMicroMsg.db`
 	+ Use your rooted file system manager app
-+ Get WeChat user resource directory from user filesystem, for example: sdcard:/tencent/MicroMsg/long-long-name. (could be different)
++ Get WeChat user resource directory from user filesystem, possibly at: /mnt/sdcard/tencent/MicroMsg/long-long-name:
+	+ adb pull /mnt/sdcard/tencent/MicroMsg/long-long-name
 + Get Wechat uin, possible ways are:
 	+ Login to [web-based wechat](https://wx.qq.com); get wxuin=1234567 from `document.cookie`
-	+ Get ``default_uin`` from /data/data/com.tencent.mm/shared_prefs/system_config_prefs.xml.
+	+
+```
+adb pull /data/data/com.tencent.mm/shared_prefs/system_config_prefs.xml
+grep 'default_uin' system_config_prefs.xml | grep -o 'value="[0-9]*' | cut -c 8-
+```
+
+
 + Get phone IMEI, possible ways are:
 	+ Call `*#06#` on your phone
 	+ Find IMEI in system settings
@@ -37,9 +44,8 @@
 ```
 
 ### TODO
-+ Parse uncommon message types
-+ Separate messages into multiple html files
 + Group message
++ Change max size for custom emoji
 + Fix smiley spacing in html
 + Show name of emoji in text output
 + Search by uid/username..
diff --git a/lib/msg.py b/lib/msg.py
index 2b86303..475093a 100644
--- a/lib/msg.py
+++ b/lib/msg.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: msg.py
-# Date: Mon Dec 22 23:04:02 2014 +0800
+# Date: Wed Dec 24 22:00:42 2014 +0800
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 from datetime import datetime
@@ -51,7 +51,7 @@ class WeChatMsg(object):
                     label = poiname
             except:
                 pass
-            return label + " ({},{})".format(loc['x'], loc['y'])
+            return "LOCATION:" + label + " ({},{})".format(loc['x'], loc['y'])
         elif self.type == TYPE_VOIP:
             return "REQUEST VIDEO CHAT"
         elif self.type == TYPE_LINK:
diff --git a/lib/msgslice.py b/lib/msgslice.py
index ce74885..013a7e3 100644
--- a/lib/msgslice.py
+++ b/lib/msgslice.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: msgslice.py
-# Date: Mon Dec 22 23:56:55 2014 +0800
+# Date: Wed Dec 24 22:06:41 2014 +0800
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 class MessageSlicerByTime(object):
@@ -52,7 +52,7 @@ class MessageSlicerBySize(object):
                     now = [m]
                     continue
             now.append(m)
-        if len(now) > self.size / 2:
+        if len(now) > self.size / 2 or len(ret) == 0:
             ret.append(now)
         else:
             ret[-1].extend(now)
diff --git a/lib/smiley.py b/lib/smiley.py
index 5881b5d..0b93ee8 100755
--- a/lib/smiley.py
+++ b/lib/smiley.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: smiley.py
-# Date: Mon Dec 22 16:50:15 2014 +0800
+# Date: Wed Dec 24 22:16:33 2014 +0800
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import os
@@ -13,7 +13,8 @@ UNICODE_SMILEY_FILE = os.path.join(LIB_PATH, 'static', 'unicode-smiley.json')
 TENCENT_SMILEY_FILE = os.path.join(LIB_PATH, 'static', 'tencent-smiley.json')
 TENCENT_EXTRASMILEY_FILE = os.path.join(LIB_PATH,
                                        'static', 'tencent-smiley-extra.json')
-UNICODE_SMILEY_RE = re.compile(u'[\U00010000-\U0010ffff]|[\u2600-\u2764]|\u2122|\u00a9|\u00ae')
+UNICODE_SMILEY_RE = re.compile(
+    u'[\U00010000-\U0010ffff]|[\u2600-\u2764]|\u2122|\u00a9|\u00ae|[\ue000-\ue5ff]')
 
 class SmileyProvider(object):
     def __init__(self, html_replace=True):
@@ -36,9 +37,13 @@ class SmileyProvider(object):
         # 1f35c -> "\ue340"
         #self.unicode_smiley_code = gUnicodeCodeMap
 
-        # u'\U0001f35c' -> "e340"
+        # u'\U0001f35c' -> "e340"   # for iphone
+        # u'\ue415' -> 'e415'       # for android
+        unicode_smiley_dict = json.load(open(UNICODE_SMILEY_FILE))
         self.unicode_smiley = {unichr(int(k, 16)): hex(ord(v))[2:] for k, v in
-                                  json.load(open(UNICODE_SMILEY_FILE)).iteritems()}
+                                unicode_smiley_dict.iteritems()}
+        self.unicode_smiley.update({v: hex(ord(v))[2:] for _, v in
+                                unicode_smiley_dict.iteritems()})
         self.used_smiley_id = set()
 
 
@@ -75,6 +80,6 @@ class SmileyProvider(object):
 
 if __name__ == '__main__':
     smiley = SmileyProvider()
-    msg = u"[挥手]哈哈呵呵ｈｉｈｉ\U0001f684\u2728\u0001 /::<"
+    msg = u"[挥手]哈哈呵呵ｈｉｈｉ\U0001f684\u2728\u0001 /::<\ue415"
     msg = smiley.replace_smileycode(msg)
     print msg
diff --git a/lib/static/gen_smiley_css.py b/lib/static/gen_smiley_css.py
index 49c5664..38789f2 100755
--- a/lib/static/gen_smiley_css.py
+++ b/lib/static/gen_smiley_css.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 # File: gen_smiley_css.py
-# Date: Mon Dec 22 21:44:00 2014 +0800
+# Date: Wed Dec 24 22:20:08 2014 +0800
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import os
@@ -13,7 +13,7 @@ OUTPUT_FILE = os.path.join(DIR_PATH, 'smiley.css')
 
 HEAD = """.smiley {
     padding: 1px;
-    background-position: 0px -2px;
+    background-position: -1px -1px;
     background-repeat: no-repeat;
     width: 20px;
     height: 20px;
diff --git a/lib/static/smileys/down2.sh b/lib/static/smileys/down2.sh
index a3996c0..1ccdee6 100755
--- a/lib/static/smileys/down2.sh
+++ b/lib/static/smileys/down2.sh
@@ -1,16 +1,16 @@
 #!/bin/bash -e
 # File: down2.sh
-# Date: Sun Dec 14 01:18:45 2014 +0800
+# Date: Wed Dec 24 22:31:37 2014 +0800
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 # This script is used to download unicode emoji
 
-emojis=$(cat ../../emojiname.py | grep -o '\\ue[^"]*' | cut -c 3-)
+emojis=$(cat ../unicode-smiley.json | grep -o '\\ue[^"]*' | cut -c 3-)
 for i in $emojis; do
 	size=$(wc -c "$i.png" 2>/dev/null | cut -f 1 -d ' ')
 	if [[ -n "$size" && $size -ge 0 ]]; then
 		echo "File $i Already There!"
 	else
-		wget http://www.easyapns.com/emoji/$i.png
+		wget http://www.easyapns.com/emoji/$i.png &
 	fi
 done
diff --git a/lib/static/smileys/e001.png b/lib/static/smileys/e001.png
index 9986cd6..28ed310 100644
Binary files a/lib/static/smileys/e001.png and b/lib/static/smileys/e001.png differ
diff --git a/lib/static/smileys/e002.png b/lib/static/smileys/e002.png
index 754be74..63dd967 100644
Binary files a/lib/static/smileys/e002.png and b/lib/static/smileys/e002.png differ
diff --git a/lib/static/smileys/e003.png b/lib/static/smileys/e003.png
index 0b3bf46..43af927 100644
Binary files a/lib/static/smileys/e003.png and b/lib/static/smileys/e003.png differ
diff --git a/lib/static/smileys/e004.png b/lib/static/smileys/e004.png
index c7e5f30..18f9c55 100644
Binary files a/lib/static/smileys/e004.png and b/lib/static/smileys/e004.png differ
diff --git a/lib/static/smileys/e005.png b/lib/static/smileys/e005.png
index dacc3cc..1e60e82 100644
Binary files a/lib/static/smileys/e005.png and b/lib/static/smileys/e005.png differ
diff --git a/lib/static/smileys/e008.png b/lib/static/smileys/e008.png
index 80be999..98fa5c9 100644
Binary files a/lib/static/smileys/e008.png and b/lib/static/smileys/e008.png differ
diff --git a/lib/static/smileys/e009.png b/lib/static/smileys/e009.png
index 9d9af2f..506e72c 100644
Binary files a/lib/static/smileys/e009.png and b/lib/static/smileys/e009.png differ
diff --git a/lib/static/smileys/e00c.png b/lib/static/smileys/e00c.png
index e034841..d8a5c4a 100644
Binary files a/lib/static/smileys/e00c.png and b/lib/static/smileys/e00c.png differ
diff --git a/lib/static/smileys/e00d.png b/lib/static/smileys/e00d.png
index 0262a95..40c79fa 100644
Binary files a/lib/static/smileys/e00d.png and b/lib/static/smileys/e00d.png differ
diff --git a/lib/static/smileys/e00e.png b/lib/static/smileys/e00e.png
index c4545e6..296a27e 100644
Binary files a/lib/static/smileys/e00e.png and b/lib/static/smileys/e00e.png differ
diff --git a/lib/static/smileys/e00f.png b/lib/static/smileys/e00f.png
index 25b985e..3b1d06a 100644
Binary files a/lib/static/smileys/e00f.png and b/lib/static/smileys/e00f.png differ
diff --git a/lib/static/smileys/e011.png b/lib/static/smileys/e011.png
index a184527..8a5fe5f 100644
Binary files a/lib/static/smileys/e011.png and b/lib/static/smileys/e011.png differ
diff --git a/lib/static/smileys/e014.png b/lib/static/smileys/e014.png
index 57b9516..6b8276d 100644
Binary files a/lib/static/smileys/e014.png and b/lib/static/smileys/e014.png differ
diff --git a/lib/static/smileys/e016.png b/lib/static/smileys/e016.png
index 6aeb63d..6a0c50d 100644
Binary files a/lib/static/smileys/e016.png and b/lib/static/smileys/e016.png differ
diff --git a/lib/static/smileys/e018.png b/lib/static/smileys/e018.png
index a4e360f..62247ad 100644
Binary files a/lib/static/smileys/e018.png and b/lib/static/smileys/e018.png differ
diff --git a/lib/static/smileys/e01a.png b/lib/static/smileys/e01a.png
index 3d19525..ca841c0 100644
Binary files a/lib/static/smileys/e01a.png and b/lib/static/smileys/e01a.png differ
diff --git a/lib/static/smileys/e01d.png b/lib/static/smileys/e01d.png
index 59776d6..4ff8da6 100644
Binary files a/lib/static/smileys/e01d.png and b/lib/static/smileys/e01d.png differ
diff --git a/lib/static/smileys/e022.png b/lib/static/smileys/e022.png
index ea106ad..34b0497 100644
Binary files a/lib/static/smileys/e022.png and b/lib/static/smileys/e022.png differ
diff --git a/lib/static/smileys/e023.png b/lib/static/smileys/e023.png
index 033b0bd..46af7d8 100644
Binary files a/lib/static/smileys/e023.png and b/lib/static/smileys/e023.png differ
diff --git a/lib/static/smileys/e032.png b/lib/static/smileys/e032.png
index 7499f9e..25ddc6e 100644
Binary files a/lib/static/smileys/e032.png and b/lib/static/smileys/e032.png differ
diff --git a/lib/static/smileys/e033.png b/lib/static/smileys/e033.png
index 97009b7..dac71c5 100644
Binary files a/lib/static/smileys/e033.png and b/lib/static/smileys/e033.png differ
diff --git a/lib/static/smileys/e034.png b/lib/static/smileys/e034.png
index a29242c..95c6b9b 100644
Binary files a/lib/static/smileys/e034.png and b/lib/static/smileys/e034.png differ
diff --git a/lib/static/smileys/e035.png b/lib/static/smileys/e035.png
index 4ac57ba..b6b8487 100644
Binary files a/lib/static/smileys/e035.png and b/lib/static/smileys/e035.png differ
diff --git a/lib/static/smileys/e03c.png b/lib/static/smileys/e03c.png
index 1b4117d..41585e6 100644
Binary files a/lib/static/smileys/e03c.png and b/lib/static/smileys/e03c.png differ
diff --git a/lib/static/smileys/e03d.png b/lib/static/smileys/e03d.png
index 7624caa..e27edd4 100644
Binary files a/lib/static/smileys/e03d.png and b/lib/static/smileys/e03d.png differ
diff --git a/lib/static/smileys/e03e.png b/lib/static/smileys/e03e.png
index 48fee90..9df5c52 100644
Binary files a/lib/static/smileys/e03e.png and b/lib/static/smileys/e03e.png differ
diff --git a/lib/static/smileys/e03f.png b/lib/static/smileys/e03f.png
index a401599..2eecb9d 100644
Binary files a/lib/static/smileys/e03f.png and b/lib/static/smileys/e03f.png differ
diff --git a/lib/static/smileys/e041.png b/lib/static/smileys/e041.png
index 6958b7a..8ea19c8 100644
Binary files a/lib/static/smileys/e041.png and b/lib/static/smileys/e041.png differ
diff --git a/lib/static/smileys/e044.png b/lib/static/smileys/e044.png
index 2153945..92cc91f 100644
Binary files a/lib/static/smileys/e044.png and b/lib/static/smileys/e044.png differ
diff --git a/lib/static/smileys/e045.png b/lib/static/smileys/e045.png
index 460007f..2213a1e 100644
Binary files a/lib/static/smileys/e045.png and b/lib/static/smileys/e045.png differ
diff --git a/lib/static/smileys/e047.png b/lib/static/smileys/e047.png
index 298082c..a4100a1 100644
Binary files a/lib/static/smileys/e047.png and b/lib/static/smileys/e047.png differ
diff --git a/lib/static/smileys/e048.png b/lib/static/smileys/e048.png
index 06df91d..a7cead6 100644
Binary files a/lib/static/smileys/e048.png and b/lib/static/smileys/e048.png differ
diff --git a/lib/static/smileys/e049.png b/lib/static/smileys/e049.png
index 245a552..1b58a7c 100644
Binary files a/lib/static/smileys/e049.png and b/lib/static/smileys/e049.png differ
diff --git a/lib/static/smileys/e04a.png b/lib/static/smileys/e04a.png
index d3e4d3e..8a7dab0 100644
Binary files a/lib/static/smileys/e04a.png and b/lib/static/smileys/e04a.png differ
diff --git a/lib/static/smileys/e04b.png b/lib/static/smileys/e04b.png
index e4ed575..c071cb7 100644
Binary files a/lib/static/smileys/e04b.png and b/lib/static/smileys/e04b.png differ
diff --git a/lib/static/smileys/e04c.png b/lib/static/smileys/e04c.png
index a4d7a47..5b38efd 100644
Binary files a/lib/static/smileys/e04c.png and b/lib/static/smileys/e04c.png differ
diff --git a/lib/static/smileys/e04e.png b/lib/static/smileys/e04e.png
index 9861b35..7e85b15 100644
Binary files a/lib/static/smileys/e04e.png and b/lib/static/smileys/e04e.png differ
diff --git a/lib/static/smileys/e04f.png b/lib/static/smileys/e04f.png
index 0ba5e1c..b7d5b93 100644
Binary files a/lib/static/smileys/e04f.png and b/lib/static/smileys/e04f.png differ
diff --git a/lib/static/smileys/e050.png b/lib/static/smileys/e050.png
index 3dea7bd..14e74e8 100644
Binary files a/lib/static/smileys/e050.png and b/lib/static/smileys/e050.png differ
diff --git a/lib/static/smileys/e051.png b/lib/static/smileys/e051.png
index 8fc24ae..d45cbfa 100644
Binary files a/lib/static/smileys/e051.png and b/lib/static/smileys/e051.png differ
diff --git a/lib/static/smileys/e052.png b/lib/static/smileys/e052.png
index 848fe29..e34c9ee 100644
Binary files a/lib/static/smileys/e052.png and b/lib/static/smileys/e052.png differ
diff --git a/lib/static/smileys/e053.png b/lib/static/smileys/e053.png
index 467339d..1b4ee09 100644
Binary files a/lib/static/smileys/e053.png and b/lib/static/smileys/e053.png differ
diff --git a/lib/static/smileys/e054.png b/lib/static/smileys/e054.png
index 6ccb561..ee819af 100644
Binary files a/lib/static/smileys/e054.png and b/lib/static/smileys/e054.png differ
diff --git a/lib/static/smileys/e055.png b/lib/static/smileys/e055.png
index 751f82f..b2be310 100644
Binary files a/lib/static/smileys/e055.png and b/lib/static/smileys/e055.png differ
diff --git a/lib/static/smileys/e056.png b/lib/static/smileys/e056.png
index a1ff293..c3ed2bf 100644
Binary files a/lib/static/smileys/e056.png and b/lib/static/smileys/e056.png differ
diff --git a/lib/static/smileys/e057.png b/lib/static/smileys/e057.png
index 2d78ef3..dbbf5fb 100644
Binary files a/lib/static/smileys/e057.png and b/lib/static/smileys/e057.png differ
diff --git a/lib/static/smileys/e058.png b/lib/static/smileys/e058.png
index 38640c6..aa65ce9 100644
Binary files a/lib/static/smileys/e058.png and b/lib/static/smileys/e058.png differ
diff --git a/lib/static/smileys/e059.png b/lib/static/smileys/e059.png
index 20b73fb..d5db80c 100644
Binary files a/lib/static/smileys/e059.png and b/lib/static/smileys/e059.png differ
diff --git a/lib/static/smileys/e05a.png b/lib/static/smileys/e05a.png
index 247c055..9f6a23e 100644
Binary files a/lib/static/smileys/e05a.png and b/lib/static/smileys/e05a.png differ
diff --git a/lib/static/smileys/e101.png b/lib/static/smileys/e101.png
index 0bcaf34..186dab5 100644
Binary files a/lib/static/smileys/e101.png and b/lib/static/smileys/e101.png differ
diff --git a/lib/static/smileys/e105.png b/lib/static/smileys/e105.png
index eba57ef..55bbb17 100644
Binary files a/lib/static/smileys/e105.png and b/lib/static/smileys/e105.png differ
diff --git a/lib/static/smileys/e106.png b/lib/static/smileys/e106.png
index 3a3fe20..9f3572d 100644
Binary files a/lib/static/smileys/e106.png and b/lib/static/smileys/e106.png differ
diff --git a/lib/static/smileys/e107.png b/lib/static/smileys/e107.png
index 788a251..586bd99 100644
Binary files a/lib/static/smileys/e107.png and b/lib/static/smileys/e107.png differ
diff --git a/lib/static/smileys/e108.png b/lib/static/smileys/e108.png
index fab8b56..ac24671 100644
Binary files a/lib/static/smileys/e108.png and b/lib/static/smileys/e108.png differ
diff --git a/lib/static/smileys/e109.png b/lib/static/smileys/e109.png
index ea5f640..72d640c 100644
Binary files a/lib/static/smileys/e109.png and b/lib/static/smileys/e109.png differ
diff --git a/lib/static/smileys/e10a.png b/lib/static/smileys/e10a.png
index 31e0841..ba3c328 100644
Binary files a/lib/static/smileys/e10a.png and b/lib/static/smileys/e10a.png differ
diff --git a/lib/static/smileys/e10b.png b/lib/static/smileys/e10b.png
index f41d25a..5537411 100644
Binary files a/lib/static/smileys/e10b.png and b/lib/static/smileys/e10b.png differ
diff --git a/lib/static/smileys/e10c.png b/lib/static/smileys/e10c.png
index 4a6d2fe..8345fed 100644
Binary files a/lib/static/smileys/e10c.png and b/lib/static/smileys/e10c.png differ
diff --git a/lib/static/smileys/e10d.png b/lib/static/smileys/e10d.png
index 9d0c02c..b71eb62 100644
Binary files a/lib/static/smileys/e10d.png and b/lib/static/smileys/e10d.png differ
diff --git a/lib/static/smileys/e10e.png b/lib/static/smileys/e10e.png
index a966eb1..b43932e 100644
Binary files a/lib/static/smileys/e10e.png and b/lib/static/smileys/e10e.png differ
diff --git a/lib/static/smileys/e10f.png b/lib/static/smileys/e10f.png
index b263984..dbb7276 100644
Binary files a/lib/static/smileys/e10f.png and b/lib/static/smileys/e10f.png differ
diff --git a/lib/static/smileys/e111.png b/lib/static/smileys/e111.png
index b5743d6..b2354eb 100644
Binary files a/lib/static/smileys/e111.png and b/lib/static/smileys/e111.png differ
diff --git a/lib/static/smileys/e112.png b/lib/static/smileys/e112.png
index fe2456b..0b38992 100644
Binary files a/lib/static/smileys/e112.png and b/lib/static/smileys/e112.png differ
diff --git a/lib/static/smileys/e113.png b/lib/static/smileys/e113.png
index fa66cb4..dc66fa9 100644
Binary files a/lib/static/smileys/e113.png and b/lib/static/smileys/e113.png differ
diff --git a/lib/static/smileys/e116.png b/lib/static/smileys/e116.png
index 2991e2a..de19104 100644
Binary files a/lib/static/smileys/e116.png and b/lib/static/smileys/e116.png differ
diff --git a/lib/static/smileys/e11a.png b/lib/static/smileys/e11a.png
index 2e1dc5a..d8bf4e9 100644
Binary files a/lib/static/smileys/e11a.png and b/lib/static/smileys/e11a.png differ
diff --git a/lib/static/smileys/e11b.png b/lib/static/smileys/e11b.png
index d6a66bd..7304659 100644
Binary files a/lib/static/smileys/e11b.png and b/lib/static/smileys/e11b.png differ
diff --git a/lib/static/smileys/e11c.png b/lib/static/smileys/e11c.png
index b88afab..a4ca6bb 100644
Binary files a/lib/static/smileys/e11c.png and b/lib/static/smileys/e11c.png differ
diff --git a/lib/static/smileys/e11d.png b/lib/static/smileys/e11d.png
index 80310cb..6b61b84 100644
Binary files a/lib/static/smileys/e11d.png and b/lib/static/smileys/e11d.png differ
diff --git a/lib/static/smileys/e120.png b/lib/static/smileys/e120.png
index a5a8509..ba38235 100644
Binary files a/lib/static/smileys/e120.png and b/lib/static/smileys/e120.png differ
diff --git a/lib/static/smileys/e126.png b/lib/static/smileys/e126.png
index 51d87aa..a4eb108 100644
Binary files a/lib/static/smileys/e126.png and b/lib/static/smileys/e126.png differ
diff --git a/lib/static/smileys/e12a.png b/lib/static/smileys/e12a.png
index 1ad5f17..82bc701 100644
Binary files a/lib/static/smileys/e12a.png and b/lib/static/smileys/e12a.png differ
diff --git a/lib/static/smileys/e12b.png b/lib/static/smileys/e12b.png
index 6749c2c..59059fe 100644
Binary files a/lib/static/smileys/e12b.png and b/lib/static/smileys/e12b.png differ
diff --git a/lib/static/smileys/e12f.png b/lib/static/smileys/e12f.png
index d3e3c15..45ed9f5 100644
Binary files a/lib/static/smileys/e12f.png and b/lib/static/smileys/e12f.png differ
diff --git a/lib/static/smileys/e131.png b/lib/static/smileys/e131.png
index a6e2d59..9eaf47d 100644
Binary files a/lib/static/smileys/e131.png and b/lib/static/smileys/e131.png differ
diff --git a/lib/static/smileys/e132.png b/lib/static/smileys/e132.png
index f66bc5e..0110820 100644
Binary files a/lib/static/smileys/e132.png and b/lib/static/smileys/e132.png differ
diff --git a/lib/static/smileys/e136.png b/lib/static/smileys/e136.png
index 7a0db90..85216a1 100644
Binary files a/lib/static/smileys/e136.png and b/lib/static/smileys/e136.png differ
diff --git a/lib/static/smileys/e138.png b/lib/static/smileys/e138.png
index 33b8b78..e414874 100644
Binary files a/lib/static/smileys/e138.png and b/lib/static/smileys/e138.png differ
diff --git a/lib/static/smileys/e139.png b/lib/static/smileys/e139.png
index f162191..8882bde 100644
Binary files a/lib/static/smileys/e139.png and b/lib/static/smileys/e139.png differ
diff --git a/lib/static/smileys/e13c.png b/lib/static/smileys/e13c.png
index 69f8b36..d70b2be 100644
Binary files a/lib/static/smileys/e13c.png and b/lib/static/smileys/e13c.png differ
diff --git a/lib/static/smileys/e13d.png b/lib/static/smileys/e13d.png
index f1cfcae..dc95f16 100644
Binary files a/lib/static/smileys/e13d.png and b/lib/static/smileys/e13d.png differ
diff --git a/lib/static/smileys/e13f.png b/lib/static/smileys/e13f.png
index 032cc87..ff857a5 100644
Binary files a/lib/static/smileys/e13f.png and b/lib/static/smileys/e13f.png differ
diff --git a/lib/static/smileys/e144.png b/lib/static/smileys/e144.png
index 166ef65..dcd4b15 100644
Binary files a/lib/static/smileys/e144.png and b/lib/static/smileys/e144.png differ
diff --git a/lib/static/smileys/e145.png b/lib/static/smileys/e145.png
index bc9ef8c..14b4620 100644
Binary files a/lib/static/smileys/e145.png and b/lib/static/smileys/e145.png differ
diff --git a/lib/static/smileys/e147.png b/lib/static/smileys/e147.png
index 7226ffd..d540950 100644
Binary files a/lib/static/smileys/e147.png and b/lib/static/smileys/e147.png differ
diff --git a/lib/static/smileys/e14c.png b/lib/static/smileys/e14c.png
index b0f413a..0152986 100644
Binary files a/lib/static/smileys/e14c.png and b/lib/static/smileys/e14c.png differ
diff --git a/lib/static/smileys/e22e.png b/lib/static/smileys/e22e.png
index 0a13cfd..8ff7ce8 100644
Binary files a/lib/static/smileys/e22e.png and b/lib/static/smileys/e22e.png differ
diff --git a/lib/static/smileys/e22f.png b/lib/static/smileys/e22f.png
index 6c83b7c..c672881 100644
Binary files a/lib/static/smileys/e22f.png and b/lib/static/smileys/e22f.png differ
diff --git a/lib/static/smileys/e230.png b/lib/static/smileys/e230.png
index 1e51ba5..8c7abbe 100644
Binary files a/lib/static/smileys/e230.png and b/lib/static/smileys/e230.png differ
diff --git a/lib/static/smileys/e231.png b/lib/static/smileys/e231.png
index 228be78..d184ef9 100644
Binary files a/lib/static/smileys/e231.png and b/lib/static/smileys/e231.png differ
diff --git a/lib/static/smileys/e24e.png b/lib/static/smileys/e24e.png
index 584abbd..a9be26b 100644
Binary files a/lib/static/smileys/e24e.png and b/lib/static/smileys/e24e.png differ
diff --git a/lib/static/smileys/e24f.png b/lib/static/smileys/e24f.png
index c605f23..82ea29c 100644
Binary files a/lib/static/smileys/e24f.png and b/lib/static/smileys/e24f.png differ
diff --git a/lib/static/smileys/e252.png b/lib/static/smileys/e252.png
index b9e8126..c403d66 100644
Binary files a/lib/static/smileys/e252.png and b/lib/static/smileys/e252.png differ
diff --git a/lib/static/smileys/e303.png b/lib/static/smileys/e303.png
index eee918d..2db334c 100644
Binary files a/lib/static/smileys/e303.png and b/lib/static/smileys/e303.png differ
diff --git a/lib/static/smileys/e307.png b/lib/static/smileys/e307.png
index 675ef42..ed63151 100644
Binary files a/lib/static/smileys/e307.png and b/lib/static/smileys/e307.png differ
diff --git a/lib/static/smileys/e308.png b/lib/static/smileys/e308.png
index 08a4de7..3141c56 100644
Binary files a/lib/static/smileys/e308.png and b/lib/static/smileys/e308.png differ
diff --git a/lib/static/smileys/e30c.png b/lib/static/smileys/e30c.png
index c8825fa..e2e36db 100644
Binary files a/lib/static/smileys/e30c.png and b/lib/static/smileys/e30c.png differ
diff --git a/lib/static/smileys/e30f.png b/lib/static/smileys/e30f.png
index 2a1918d..95bf3f3 100644
Binary files a/lib/static/smileys/e30f.png and b/lib/static/smileys/e30f.png differ
diff --git a/lib/static/smileys/e310.png b/lib/static/smileys/e310.png
index c13fd09..408d5fa 100644
Binary files a/lib/static/smileys/e310.png and b/lib/static/smileys/e310.png differ
diff --git a/lib/static/smileys/e311.png b/lib/static/smileys/e311.png
index 5624870..c84ccfb 100644
Binary files a/lib/static/smileys/e311.png and b/lib/static/smileys/e311.png differ
diff --git a/lib/static/smileys/e312.png b/lib/static/smileys/e312.png
index ed6a414..f31e6e3 100644
Binary files a/lib/static/smileys/e312.png and b/lib/static/smileys/e312.png differ
diff --git a/lib/static/smileys/e31c.png b/lib/static/smileys/e31c.png
index 61cdd48..542622c 100644
Binary files a/lib/static/smileys/e31c.png and b/lib/static/smileys/e31c.png differ
diff --git a/lib/static/smileys/e322.png b/lib/static/smileys/e322.png
index 6a7290a..7f6ec7c 100644
Binary files a/lib/static/smileys/e322.png and b/lib/static/smileys/e322.png differ
diff --git a/lib/static/smileys/e323.png b/lib/static/smileys/e323.png
index 2891dca..d5b3f9b 100644
Binary files a/lib/static/smileys/e323.png and b/lib/static/smileys/e323.png differ
diff --git a/lib/static/smileys/e325.png b/lib/static/smileys/e325.png
index 89e52bc..f7e59b4 100644
Binary files a/lib/static/smileys/e325.png and b/lib/static/smileys/e325.png differ
diff --git a/lib/static/smileys/e329.png b/lib/static/smileys/e329.png
index 0d75a32..3812ac4 100644
Binary files a/lib/static/smileys/e329.png and b/lib/static/smileys/e329.png differ
diff --git a/lib/static/smileys/e32e.png b/lib/static/smileys/e32e.png
index 65226f2..2401eb9 100644
Binary files a/lib/static/smileys/e32e.png and b/lib/static/smileys/e32e.png differ
diff --git a/lib/static/smileys/e331.png b/lib/static/smileys/e331.png
index e363d21..52a634d 100644
Binary files a/lib/static/smileys/e331.png and b/lib/static/smileys/e331.png differ
diff --git a/lib/static/smileys/e332.png b/lib/static/smileys/e332.png
index 02d72b3..2b7a390 100644
Binary files a/lib/static/smileys/e332.png and b/lib/static/smileys/e332.png differ
diff --git a/lib/static/smileys/e333.png b/lib/static/smileys/e333.png
index fc60bca..cd690c0 100644
Binary files a/lib/static/smileys/e333.png and b/lib/static/smileys/e333.png differ
diff --git a/lib/static/smileys/e335.png b/lib/static/smileys/e335.png
index c3bfa66..eefcfb8 100644
Binary files a/lib/static/smileys/e335.png and b/lib/static/smileys/e335.png differ
diff --git a/lib/static/smileys/e336.png b/lib/static/smileys/e336.png
index bb1b247..23dc6e0 100644
Binary files a/lib/static/smileys/e336.png and b/lib/static/smileys/e336.png differ
diff --git a/lib/static/smileys/e337.png b/lib/static/smileys/e337.png
index d3a056d..25ec04e 100644
Binary files a/lib/static/smileys/e337.png and b/lib/static/smileys/e337.png differ
diff --git a/lib/static/smileys/e33a.png b/lib/static/smileys/e33a.png
index ad9ff5e..5265deb 100644
Binary files a/lib/static/smileys/e33a.png and b/lib/static/smileys/e33a.png differ
diff --git a/lib/static/smileys/e33b.png b/lib/static/smileys/e33b.png
index 85825c6..62a0aef 100644
Binary files a/lib/static/smileys/e33b.png and b/lib/static/smileys/e33b.png differ
diff --git a/lib/static/smileys/e33f.png b/lib/static/smileys/e33f.png
index e8b64ee..b2b8ce4 100644
Binary files a/lib/static/smileys/e33f.png and b/lib/static/smileys/e33f.png differ
diff --git a/lib/static/smileys/e340.png b/lib/static/smileys/e340.png
index ef24b10..743fd74 100644
Binary files a/lib/static/smileys/e340.png and b/lib/static/smileys/e340.png differ
diff --git a/lib/static/smileys/e344.png b/lib/static/smileys/e344.png
index de503f4..3c0b507 100644
Binary files a/lib/static/smileys/e344.png and b/lib/static/smileys/e344.png differ
diff --git a/lib/static/smileys/e345.png b/lib/static/smileys/e345.png
index f8cd9d4..1ae0247 100644
Binary files a/lib/static/smileys/e345.png and b/lib/static/smileys/e345.png differ
diff --git a/lib/static/smileys/e34b.png b/lib/static/smileys/e34b.png
index fe818f7..fb5c3a3 100644
Binary files a/lib/static/smileys/e34b.png and b/lib/static/smileys/e34b.png differ
diff --git a/lib/static/smileys/e401.png b/lib/static/smileys/e401.png
index 31467f7..0365681 100644
Binary files a/lib/static/smileys/e401.png and b/lib/static/smileys/e401.png differ
diff --git a/lib/static/smileys/e402.png b/lib/static/smileys/e402.png
index 430c48a..a0e6807 100644
Binary files a/lib/static/smileys/e402.png and b/lib/static/smileys/e402.png differ
diff --git a/lib/static/smileys/e403.png b/lib/static/smileys/e403.png
index 50ec10e..d8fe8df 100644
Binary files a/lib/static/smileys/e403.png and b/lib/static/smileys/e403.png differ
diff --git a/lib/static/smileys/e404.png b/lib/static/smileys/e404.png
index 678480c..74feb03 100644
Binary files a/lib/static/smileys/e404.png and b/lib/static/smileys/e404.png differ
diff --git a/lib/static/smileys/e405.png b/lib/static/smileys/e405.png
index 39d1d46..dec1425 100644
Binary files a/lib/static/smileys/e405.png and b/lib/static/smileys/e405.png differ
diff --git a/lib/static/smileys/e406.png b/lib/static/smileys/e406.png
index 6c3beaf..7aaf645 100644
Binary files a/lib/static/smileys/e406.png and b/lib/static/smileys/e406.png differ
diff --git a/lib/static/smileys/e407.png b/lib/static/smileys/e407.png
index ea55d2d..bd3fef2 100644
Binary files a/lib/static/smileys/e407.png and b/lib/static/smileys/e407.png differ
diff --git a/lib/static/smileys/e408.png b/lib/static/smileys/e408.png
index fb50fd6..efc2da3 100644
Binary files a/lib/static/smileys/e408.png and b/lib/static/smileys/e408.png differ
diff --git a/lib/static/smileys/e409.png b/lib/static/smileys/e409.png
index ddaf549..5b5c35b 100644
Binary files a/lib/static/smileys/e409.png and b/lib/static/smileys/e409.png differ
diff --git a/lib/static/smileys/e40a.png b/lib/static/smileys/e40a.png
index fcb27af..0b09c5f 100644
Binary files a/lib/static/smileys/e40a.png and b/lib/static/smileys/e40a.png differ
diff --git a/lib/static/smileys/e40b.png b/lib/static/smileys/e40b.png
index 50bb9ba..6d75391 100644
Binary files a/lib/static/smileys/e40b.png and b/lib/static/smileys/e40b.png differ
diff --git a/lib/static/smileys/e40c.png b/lib/static/smileys/e40c.png
index 269000f..2e44be1 100644
Binary files a/lib/static/smileys/e40c.png and b/lib/static/smileys/e40c.png differ
diff --git a/lib/static/smileys/e40d.png b/lib/static/smileys/e40d.png
index b0ef819..de76707 100644
Binary files a/lib/static/smileys/e40d.png and b/lib/static/smileys/e40d.png differ
diff --git a/lib/static/smileys/e40e.png b/lib/static/smileys/e40e.png
index 3a89e98..ae73e9f 100644
Binary files a/lib/static/smileys/e40e.png and b/lib/static/smileys/e40e.png differ
diff --git a/lib/static/smileys/e40f.png b/lib/static/smileys/e40f.png
index 6345c64..88c3676 100644
Binary files a/lib/static/smileys/e40f.png and b/lib/static/smileys/e40f.png differ
diff --git a/lib/static/smileys/e410.png b/lib/static/smileys/e410.png
index f2d057b..61838ef 100644
Binary files a/lib/static/smileys/e410.png and b/lib/static/smileys/e410.png differ
diff --git a/lib/static/smileys/e411.png b/lib/static/smileys/e411.png
index d212248..1213814 100644
Binary files a/lib/static/smileys/e411.png and b/lib/static/smileys/e411.png differ
diff --git a/lib/static/smileys/e412.png b/lib/static/smileys/e412.png
index 51cb6c4..1f85d77 100644
Binary files a/lib/static/smileys/e412.png and b/lib/static/smileys/e412.png differ
diff --git a/lib/static/smileys/e413.png b/lib/static/smileys/e413.png
index a326cad..7df7e9d 100644
Binary files a/lib/static/smileys/e413.png and b/lib/static/smileys/e413.png differ
diff --git a/lib/static/smileys/e414.png b/lib/static/smileys/e414.png
index e7cd455..f667203 100644
Binary files a/lib/static/smileys/e414.png and b/lib/static/smileys/e414.png differ
diff --git a/lib/static/smileys/e415.png b/lib/static/smileys/e415.png
index f92a614..4c33a6d 100644
Binary files a/lib/static/smileys/e415.png and b/lib/static/smileys/e415.png differ
diff --git a/lib/static/smileys/e416.png b/lib/static/smileys/e416.png
index a536ec1..8278c8c 100644
Binary files a/lib/static/smileys/e416.png and b/lib/static/smileys/e416.png differ
diff --git a/lib/static/smileys/e417.png b/lib/static/smileys/e417.png
index edc3928..894a8de 100644
Binary files a/lib/static/smileys/e417.png and b/lib/static/smileys/e417.png differ
diff --git a/lib/static/smileys/e418.png b/lib/static/smileys/e418.png
index a588bab..cba23f3 100644
Binary files a/lib/static/smileys/e418.png and b/lib/static/smileys/e418.png differ
diff --git a/lib/static/smileys/e421.png b/lib/static/smileys/e421.png
index 6dfded3..aa6c113 100644
Binary files a/lib/static/smileys/e421.png and b/lib/static/smileys/e421.png differ
diff --git a/lib/static/smileys/e425.png b/lib/static/smileys/e425.png
index 75d0916..ca6598e 100644
Binary files a/lib/static/smileys/e425.png and b/lib/static/smileys/e425.png differ
diff --git a/lib/static/smileys/e42a.png b/lib/static/smileys/e42a.png
index 343e6d7..a2c1f3a 100644
Binary files a/lib/static/smileys/e42a.png and b/lib/static/smileys/e42a.png differ
diff --git a/lib/static/smileys/e42b.png b/lib/static/smileys/e42b.png
index 88df629..6dda7af 100644
Binary files a/lib/static/smileys/e42b.png and b/lib/static/smileys/e42b.png differ
diff --git a/lib/static/smileys/e435.png b/lib/static/smileys/e435.png
index 9bf080a..5d7b5f7 100644
Binary files a/lib/static/smileys/e435.png and b/lib/static/smileys/e435.png differ
diff --git a/lib/static/smileys/e437.png b/lib/static/smileys/e437.png
index e384880..5b7f858 100644
Binary files a/lib/static/smileys/e437.png and b/lib/static/smileys/e437.png differ
diff --git a/lib/static/smileys/e43c.png b/lib/static/smileys/e43c.png
index 8e2b9f3..674546b 100644
Binary files a/lib/static/smileys/e43c.png and b/lib/static/smileys/e43c.png differ
diff --git a/lib/static/smileys/e43e.png b/lib/static/smileys/e43e.png
index 15b2b30..570af26 100644
Binary files a/lib/static/smileys/e43e.png and b/lib/static/smileys/e43e.png differ
diff --git a/lib/static/smileys/e445.png b/lib/static/smileys/e445.png
index 2aff37d..2cf27b4 100644
Binary files a/lib/static/smileys/e445.png and b/lib/static/smileys/e445.png differ
diff --git a/lib/static/smileys/e448.png b/lib/static/smileys/e448.png
index d284016..17a25a6 100644
Binary files a/lib/static/smileys/e448.png and b/lib/static/smileys/e448.png differ
diff --git a/lib/static/smileys/e520.png b/lib/static/smileys/e520.png
index bba595a..3932f3a 100644
Binary files a/lib/static/smileys/e520.png and b/lib/static/smileys/e520.png differ
diff --git a/lib/static/smileys/e521.png b/lib/static/smileys/e521.png
index 3000ceb..ff3d41a 100644
Binary files a/lib/static/smileys/e521.png and b/lib/static/smileys/e521.png differ
diff --git a/lib/static/smileys/e522.png b/lib/static/smileys/e522.png
index 66ffab7..c805c55 100644
Binary files a/lib/static/smileys/e522.png and b/lib/static/smileys/e522.png differ
diff --git a/lib/static/smileys/e524.png b/lib/static/smileys/e524.png
index 003863d..df9bb52 100644
Binary files a/lib/static/smileys/e524.png and b/lib/static/smileys/e524.png differ
diff --git a/lib/static/smileys/e525.png b/lib/static/smileys/e525.png
index f686033..cf46128 100644
Binary files a/lib/static/smileys/e525.png and b/lib/static/smileys/e525.png differ
diff --git a/lib/static/smileys/e527.png b/lib/static/smileys/e527.png
index 560957b..89399e3 100644
Binary files a/lib/static/smileys/e527.png and b/lib/static/smileys/e527.png differ
diff --git a/lib/static/smileys/e52a.png b/lib/static/smileys/e52a.png
index 20f2362..d9a51e1 100644
Binary files a/lib/static/smileys/e52a.png and b/lib/static/smileys/e52a.png differ
diff --git a/lib/static/smileys/e52b.png b/lib/static/smileys/e52b.png
index 5c30596..b428372 100644
Binary files a/lib/static/smileys/e52b.png and b/lib/static/smileys/e52b.png differ
diff --git a/lib/static/smileys/e52c.png b/lib/static/smileys/e52c.png
index 71845ab..e35308b 100644
Binary files a/lib/static/smileys/e52c.png and b/lib/static/smileys/e52c.png differ
diff --git a/lib/static/smileys/e52d.png b/lib/static/smileys/e52d.png
index 94cd04a..5ff5a10 100644
Binary files a/lib/static/smileys/e52d.png and b/lib/static/smileys/e52d.png differ
diff --git a/lib/static/smileys/e52e.png b/lib/static/smileys/e52e.png
index a660cea..1288d4b 100644
Binary files a/lib/static/smileys/e52e.png and b/lib/static/smileys/e52e.png differ
diff --git a/lib/static/smileys/e52f.png b/lib/static/smileys/e52f.png
index fca3469..f94cf76 100644
Binary files a/lib/static/smileys/e52f.png and b/lib/static/smileys/e52f.png differ
diff --git a/lib/static/smileys/e531.png b/lib/static/smileys/e531.png
index 4962350..19b5622 100644
Binary files a/lib/static/smileys/e531.png and b/lib/static/smileys/e531.png differ
diff --git a/lib/static/smileys/e537.png b/lib/static/smileys/e537.png
index bd0c022..bab1fb6 100644
Binary files a/lib/static/smileys/e537.png and b/lib/static/smileys/e537.png differ