diff --git a/lib_common/src/main/java/gov/anzong/androidnga/common/util/EmoticonUtils.java b/lib_common/src/main/java/gov/anzong/androidnga/common/util/EmoticonUtils.java
index d58ed1bce..d3861c450 100644
--- a/lib_common/src/main/java/gov/anzong/androidnga/common/util/EmoticonUtils.java
+++ b/lib_common/src/main/java/gov/anzong/androidnga/common/util/EmoticonUtils.java
@@ -10,354 +10,275 @@ public class EmoticonUtils {
     public static final String[][] EMOTICON_LABEL = {
             {"ac", "AC娘"},
             {"a2", "新版AC娘"},
+            {"ng", "NG娘"},
             {"pg", "企鹅"},
             {"pst", "潘斯特"},
             {"dt", "外域三人组"},
-            {"xiongmao", "熊猫"},
-
     };
 
+    final static String PRR_EMOTION_URL = "https://img4.nga.178.com/ngabbs/post/smile/";
 
-    public static final String[][] EMOTICON_URL = {
+    public static final String[][][] EMOTICON_URL = {
             {
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc4cc6331.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc4f51be7.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc521c04b.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc5579c24.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc587c6f9.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc7a0ee49.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc7d91913.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc80140e3.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc835856c.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bc8638067.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bca2a2f43.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bca55cb6e.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bca81a77f.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcaaacb45.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcad49530.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcb093870.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcb3b8944.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcb6e96d1.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcba15fcf.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcbe35760.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcdd279bc.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcdfd9c69.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bce27ab4d.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bce4f2963.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bce7cf096.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bceb823da.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcee3d6b3.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcf0ba2db.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcf37c4c9.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bcf68ddc2.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd2497822.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd27520ef.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd2a0d49a.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd2d0a416.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd2fa0790.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd330dfad.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd35aec58.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd38bdf43.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd3b4b3bd.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052bd40397e2.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c0f41d155.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c0f6da079.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c10182a21.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c104b8e27.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c1076f119.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c10aa0303.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c10d1f08c.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c1101747c.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c112b3b1b.png",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5052c1156ec1c.png",
-                    "http://img.nga.178.com/attachments/mon_201212/07/-1324875_50c15374cd8f6.png",
-                    "http://img.nga.178.com/attachments/mon_201212/07/-1324875_50c1537cf22c8.png",
-                    "http://img.nga.178.com/attachments/mon_201212/07/-1324875_50c153963eb38.png",
-                    "http://img.nga.178.com/attachments/mon_201212/07/-1324875_50c153ad5bca3.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d84199dbdb2.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d8419e3e516.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841a1676ab.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841a63a673.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841a969837.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841ae691f0.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841b17b503.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841b488bcd.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841b7282dd.png",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d841ba3efd0.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597c090c58.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597cedefb0.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597e217236.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597e645550.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597e9d6319.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597edf1a10.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597f190a11.png",
-                    "http://img.nga.178.com/attachments/mon_201301/03/-1324875_50e597f5ce78d.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe24fff3ca8.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe25031f595.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe2505d26ed.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe25088e9cb.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe250b9488c.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe250eca35e.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe2511c5254.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe2515354fd.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/22/-1324875_50fe25191c370.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32e14f324.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32e41a1c9.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32ea8cbd2.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32ed356aa.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32f1a0345.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a32f4bdcab.png",
-                    "http://img6.nga.178.com/attachments/mon_201301/31/-1324875_510a335b9300d.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_513394f5c39c4.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_513394f8d0005.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_513394fbc54e1.gif",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_513394ffb78e2.gif",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_51339502d110b.gif",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_51339506d9c37.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_51339509ac4b4.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/04/-1324875_5133950d008f9.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/23/-1324875_514daeb78abaa.png",
-                    "http://img6.nga.178.com/attachments/mon_201303/25/-1324875_51505df66692d.png",
-
-                    "http://pic3.178.com/2017/20174851/month_1401/d6fc87f52b1d26d6768bcc0d8a7ec608.png",
-                    "http://pic3.178.com/2017/20174851/month_1401/729647a27267ac7853056f99f35ecac7.png",
-
-                    "http://pic3.178.com/2017/20174851/month_1401/a6a581a8e4a61812ae123a837f4b0d88.png",
-                    "http://pic3.178.com/2017/20174851/month_1401/c1ceadd1553e140c2bc0348720cbb2df.png",
-
-                    "http://pic3.178.com/2017/20174851/month_1401/2aa114ca0804d12f2178e0dc69d4bc8a.png",
+                    {"blink", "ac0.png"},
+                    {"goodjob", "ac1.png"},
+                    {"上", "ac2.png"},
+                    {"中枪", "ac3.png"},
+                    {"偷笑", "ac4.png"},
+                    {"冷", "ac5.png"},
+                    {"凌乱", "ac6.png"},
+                    {"吓", "ac8.png"},
+                    {"吻", "ac9.png"},
+                    {"呆", "ac10.png"},
+                    {"咦", "ac11.png"},
+                    {"哦", "ac12.png"},
+                    {"哭", "ac13.png"},
+                    {"哭1", "ac14.png"},
+                    {"哭笑", "ac15.png"},
+                    {"喘", "ac17.png"},
+                    {"心", "ac23.png"},
+                    {"囧", "ac21.png"},
+                    {"晕", "ac33.png"},
+                    {"汗", "ac34.png"},
+                    {"瞎", "ac35.png"},
+                    {"羞", "ac36.png"},
+                    {"羡慕", "ac37.png"},
+                    {"委屈", "ac22.png"},
+                    {"忧伤", "ac24.png"},
+                    {"怒", "ac25.png"},
+                    {"怕", "ac26.png"},
+                    {"惊", "ac27.png"},
+                    {"愁", "ac28.png"},
+                    {"抓狂", "ac29.png"},
+                    {"哼", "ac16.png"},
+                    {"喷", "ac18.png"},
+                    {"嘲笑", "ac19.png"},
+                    {"嘲笑1", "ac20.png"},
+                    {"抠鼻", "ac30.png"},
+                    {"无语", "ac32.png"},
+                    {"衰", "ac40.png"},
+                    {"黑枪", "ac44.png"},
+                    {"花痴", "ac38.png"},
+                    {"闪光", "ac43.png"},
+                    {"擦汗", "ac31.png"},
+                    {"茶", "ac39.png"},
+                    {"计划通", "ac41.png"},
+                    {"反对", "ac7.png"},
+                    {"赞同", "ac42.png"}
             },
             //论坛新版AC娘
             {
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_02.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_05.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_03.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_04.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_07.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_08.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_09.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_10.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_14.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_16.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_15.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_17.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_21.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_23.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_24.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_25.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_27.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_28.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_30.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_31.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_32.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_33.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_36.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_51.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_53.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_54.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_55.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_47.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_48.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_45.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_49.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_18.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_19.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_52.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_26.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_11.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_12.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_13.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_20.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_22.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_42.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_37.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_38.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_39.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_41.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/a2_40.png"
+                    {"goodjob", "a2_02.png"},
+                    {"诶嘿", "a2_05.png"},
+                    {"偷笑", "a2_03.png"},
+                    {"怒", "a2_04.png"},
+                    {"笑", "a2_07.png"},
+                    {"那个…", "a2_08.png"},
+                    {"哦嗬嗬嗬", "a2_09.png"},
+                    {"舔", "a2_10.png"},
+                    {"鬼脸", "a2_14.png"},
+                    {"冷", "a2_16.png"},
+                    {"大哭", "a2_15.png"},
+                    {"哭", "a2_17.png"},
+                    {"恨", "a2_21.png"},
+                    {"中枪", "a2_23.png"},
+                    {"囧", "a2_24.png"},
+                    {"你看看你", "a2_25.png"},
+                    {"doge", "a2_27.png"},
+                    {"自戳双目", "a2_28.png"},
+                    {"偷吃", "a2_30.png"},
+                    {"冷笑", "a2_31.png"},
+                    {"壁咚", "a2_32.png"},
+                    {"不活了", "a2_33.png"},
+                    {"不明觉厉", "a2_36.png"},
+                    {"是在下输了", "a2_51.png"},
+                    {"你为猴这么", "a2_53.png"},
+                    {"干杯", "a2_54.png"},
+                    {"干杯2", "a2_55.png"},
+                    {"异议", "a2_47.png"},
+                    {"认真", "a2_48.png"},
+                    {"你已经死了", "a2_45.png"},
+                    {"你这种人…", "a2_49.png"},
+                    {"妮可妮可妮", "a2_18.png"},
+                    {"惊", "a2_19.png"},
+                    {"抢镜头", "a2_52.png"},
+                    {"yes", "a2_26.png"},
+                    {"有何贵干", "a2_11.png"},
+                    {"病娇", "a2_12.png"},
+                    {"lucky", "a2_13.png"},
+                    {"poi", "a2_20.png"},
+                    {"囧2", "a2_22.png"},
+                    {"威吓", "a2_42.png"},
+                    {"jojo立", "a2_37.png"},
+                    {"jojo立2", "a2_38.png"},
+                    {"jojo立3", "a2_39.png"},
+                    {"jojo立4", "a2_41.png"},
+                    {"jojo立5", "a2_40.png"},
             },
+            //NG娘
             {
-                    "http://img4.nga.cn/ngabbs/post/smile/pg01.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg02.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg03.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg04.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg05.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg06.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg07.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg08.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg09.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg10.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg11.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg12.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg13.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg14.png",
-                    "http://img4.nga.cn/ngabbs/post/smile/pg15.png",
+                    {"呲牙笑", "ng_1.png"},
+                    {"奸笑", "ng_2.png"},
+                    {"问号", "ng_3.png"},
+                    {"茶", "ng_4.png"},
+                    {"笑指", "ng_5.png"},
+                    {"燃尽", "ng_6.png"},
+                    {"晕", "ng_7.png"},
+                    {"扇笑", "ng_8.png"},
+                    {"寄", "ng_9.png"},
+                    {"别急", "ng_10.png"},
+                    {"doge", "ng_11.png"},
+                    {"丧", "ng_12.png"},
+                    {"汗", "ng_13.png"},
+                    {"叹气", "ng_15.png"},
+                    {"吃饼", "ng_16.png"},
+                    {"吃瓜", "ng_17.png"},
+                    {"吐舌", "ng_18.png"},
+                    {"哭", "ng_19.png"},
+                    {"喘", "ng_20.png"},
+                    {"心", "ng_21.png"},
+                    {"喷", "ng_22.png"},
+                    {"困", "ng_24.png"},
+                    {"大哭", "ng_25.png"},
+                    {"大惊", "ng_26.png"},
+                    {"害怕", "ng_27.png"},
+                    {"惊", "ng_28.png"},
+                    {"暴怒", "ng_30.png"},
+                    {"气愤", "ng_31.png"},
+                    {"热", "ng_32.png"},
+                    {"瓜不熟", "ng_33.png"},
+                    {"瞎", "ng_34.png"},
+                    {"色", "ng_35.png"},
+                    {"斜眼", "ng_37.png"},
+                    {"问号大", "ng_38.png"},
             },
+            //企鹅
             {
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt00.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt01.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt02.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt03.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt04.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt05.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt06.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt07.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt08.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt09.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt10.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt11.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt12.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt13.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt14.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt15.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt16.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt17.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt18.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt19.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt20.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt21.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt22.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt23.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt24.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt25.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt26.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt27.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt28.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt29.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt30.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt31.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt32.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt33.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt34.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt35.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt36.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt37.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt38.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt39.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt40.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt41.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt42.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt43.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt44.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt45.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt46.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt47.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt48.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt49.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt50.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt51.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt52.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt53.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt54.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt55.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt56.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt57.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt58.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt59.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt60.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt61.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt62.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt63.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/pt64.png",
-            },//yixia dt 外域三人组
+                    {"战斗力", "pg01.png"},
+                    {"哈啤", "pg02.png"},
+                    {"满分", "pg03.png"},
+                    {"衰", "pg04.png"},
+                    {"拒绝", "pg05.png"},
+                    {"心", "pg06.png"},
+                    {"严肃", "pg07.png"},
+                    {"吃瓜", "pg08.png"},
+                    {"嘣", "pg09.png"},
+                    {"嘣2", "pg10.png"},
+                    {"冻", "pg11.png"},
+                    {"谢", "pg12.png"},
+                    {"哭", "pg13.png"},
+                    {"响指", "pg14.png"},
+                    {"转身", "pg15.png"},
+            },
+            //潘斯特
             {
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt01.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt02.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt03.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt04.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt05.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt06.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt07.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt08.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt09.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt10.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt11.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt12.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt13.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt14.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt15.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt16.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt17.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt18.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt19.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt20.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt21.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt22.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt23.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt24.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt25.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt26.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt27.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt28.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt29.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt30.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt31.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt32.png",
-                    "http://img4.nga.178.com/ngabbs/post/smile/dt33.png",},
-            //xiongmao
+                    {"举手", "pt00.png"},
+                    {"亲", "pt01.png"},
+                    {"偷笑", "pt02.png"},
+                    {"偷笑2", "pt03.png"},
+                    {"偷笑3", "pt04.png"},
+                    {"傻眼", "pt05.png"},
+                    {"傻眼2", "pt06.png"},
+                    {"兔子", "pt07.png"},
+                    {"发光", "pt08.png"},
+                    {"呆", "pt09.png"},
+                    {"呆2", "pt10.png"},
+                    {"呆3", "pt11.png"},
+                    {"呕", "pt12.png"},
+                    {"呵欠", "pt13.png"},
+                    {"哭", "pt14.png"},
+                    {"哭2", "pt15.png"},
+                    {"哭3", "pt16.png"},
+                    {"嘲笑", "pt17.png"},
+                    {"基", "pt18.png"},
+                    {"宅", "pt19.png"},
+                    {"安慰", "pt20.png"},
+                    {"幸福", "pt21.png"},
+                    {"开心", "pt22.png"},
+                    {"开心2", "pt23.png"},
+                    {"开心3", "pt24.png"},
+                    {"怀疑", "pt25.png"},
+                    {"怒", "pt26.png"},
+                    {"怒2", "pt27.png"},
+                    {"怨", "pt28.png"},
+                    {"惊吓", "pt29.png"},
+                    {"惊吓2", "pt30.png"},
+                    {"惊呆", "pt31.png"},
+                    {"惊呆2", "pt32.png"},
+                    {"惊呆3", "pt33.png"},
+                    {"惨", "pt34.png"},
+                    {"斜眼", "pt35.png"},
+                    {"晕", "pt36.png"},
+                    {"汗", "pt37.png"},
+                    {"泪", "pt38.png"},
+                    {"泪2", "pt39.png"},
+                    {"泪3", "pt40.png"},
+                    {"泪4", "pt41.png"},
+                    {"满足", "pt42.png"},
+                    {"满足2", "pt43.png"},
+                    {"火星", "pt44.png"},
+                    {"牙疼", "pt45.png"},
+                    {"电击", "pt46.png"},
+                    {"看戏", "pt47.png"},
+                    {"眼袋", "pt48.png"},
+                    {"眼镜", "pt49.png"},
+                    {"笑而不语", "pt50.png"},
+                    {"紧张", "pt51.png"},
+                    {"美味", "pt52.png"},
+                    {"背", "pt53.png"},
+                    {"脸红", "pt54.png"},
+                    {"脸红2", "pt55.png"},
+                    {"腐", "pt56.png"},
+                    {"星星眼", "pt57.png"},
+                    {"谢", "pt58.png"},
+                    {"醉", "pt59.png"},
+                    {"闷", "pt60.png"},
+                    {"闷2", "pt61.png"},
+                    {"音乐", "pt62.png"},
+                    {"黑脸", "pt63.png"},
+                    {"鼻血", "pt64.png"},
+            },//yixia dt 外域三人组
             {
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501659f095f86.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501659f46c92c.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501659f74f065.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501659fb92e28.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501659fef2d35.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_50165a095609b.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_50165a0c8f964.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016817445bdb.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016817c3f714.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501681825a85d.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501681873b6a9.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016818c54525.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_50168192b5000.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016819980fbc.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016819dcc612.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501681a579a75.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501681aa5d92a.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_501686cde01cb.jpg",
-                    "http://img.nga.178.com/attachments/mon_201202/04/-447601_4f2d1e80ab343.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016ae12ae284.jpg",
-                    "http://img.nga.178.com/attachments/mon_201207/30/-7_5016ae1989baf.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/04/-47218_5045aeafd7372.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017a342b27.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017a6ec30d.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017ad66045.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017b09a8c3.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017b484549.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017ef537ea.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017f2f26a0.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017f5b84d6.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017f85b1b1.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-47218_505017fb0e250.jpg",
-                    "http://pic3.178.com/142/1424179/month_1208/2acb155e2a5b9422a94186316b1aef60.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-7_5050972e61c94.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-7_5050974c1df08.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-7_50509738ceb3c.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-7_50509743b31a9.png",
-                    "http://img.nga.178.com/attachments/mon_201209/12/-7_505097122174c.png",
-                    "http://pic3.178.com/142/1424179/month_1208/9f097ebcdede8616e69b8966328cf52a.jpg",
-                    "http://pic3.178.com/142/1424179/month_1209/64e25c177c3a3761f715a3893588a093.jpg",
-                    "http://pic3.178.com/142/1424179/month_1208/6531e88e4f1209a5b404cc0f4507fc37.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/13/-47218_5051537c6f0a7.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/14/-47218_5053040c1ff51.gif",
-                    "http://img.nga.178.com/attachments/mon_201209/13/-47218_50515376c354c.jpg",
-                    "http://img.nga.178.com/attachments/mon_201209/13/-47218_50515379d93e2.jpg",
-                    "http://pic3.178.com/142/1424179/month_1209/159086d6643b2dd47809ae5311321e48.jpg",
-                    "http://pic3.178.com/142/1424179/month_1209/f0bc17b405346eb419e15d9a4078cc1a.jpg",
-                    "http://pic3.178.com/142/1424179/month_1209/f523d833d988bd687d9205c8462cd69a.jpg",
-                    "http://pic3.178.com/1577/15776622/month_1309/1205c1a4d4d2b19cc145c129cc97e126.jpg",
-                    "http://img.nga.178.com/attachments/mon_201212/24/-1324875_50d8593397258.jpg",
-                    "http://pic3.178.com/2017/20174851/month_1401/3eecc7a0783180ad493869564f7dbcff.jpg",
-                    "http://img6.nga.178.com/attachments/mon_201302/11/-7_5118d1cacbf75.jpg",
-                    "http://pic3.178.com/1577/15776622/month_1309/1b82eab2748c69a301d176be0ab1d6d7.jpg",
-                    "http://pic3.178.com/2017/20174851/month_1401/837b686eee1d1338fb9a1012e00cab80.jpg"
+                    {"ROLL", "dt01.png"},
+                    {"上", "dt02.png"},
+                    {"傲娇", "dt03.png"},
+                    {"叉出去", "dt04.png"},
+                    {"发光", "dt05.png"},
+                    {"呵欠", "dt06.png"},
+                    {"哭", "dt07.png"},
+                    {"啃古头", "dt08.png"},
+                    {"嘲笑", "dt09.png"},
+                    {"心", "dt10.png"},
+                    {"怒", "dt11.png"},
+                    {"怒2", "dt12.png"},
+                    {"怨", "dt13.png"},
+                    {"惊", "dt14.png"},
+                    {"惊2", "dt15.png"},
+                    {"无语", "dt16.png"},
+                    {"星星眼", "dt17.png"},
+                    {"星星眼2", "dt18.png"},
+                    {"晕", "dt19.png"},
+                    {"注意", "dt20.png"},
+                    {"注意2", "dt21.png"},
+                    {"泪", "dt22.png"},
+                    {"泪2", "dt23.png"},
+                    {"烧", "dt24.png"},
+                    {"笑", "dt25.png"},
+                    {"笑2", "dt26.png"},
+                    {"笑3", "dt27.png"},
+                    {"脸红", "dt28.png"},
+                    {"药", "dt29.png"},
+                    {"衰", "dt30.png"},
+                    {"鄙视", "dt31.png"},
+                    {"闲", "dt32.png"},
+                    {"黑脸", "dt33.png"}
             },
-
     };
 
     public static String getPathByURI(String uri) {
         for (int category = 0; category < EMOTICON_URL.length; category++) {
             for (int index = 0; index < EMOTICON_URL[category].length; index++) {
-                if (EMOTICON_URL[category][index].equals(uri)) {
+                if (EMOTICON_URL[category][index][0].equals(uri)) {
                     return getFilePath(category, index);
                 }
             }
@@ -366,7 +287,7 @@ public static String getPathByURI(String uri) {
     }
 
     private static String getFilePath(int category, int position) {
-        String httpUri = EMOTICON_URL[category][position];
+        String httpUri = EMOTICON_URL[category][position][0];
         return EMOTICON_LABEL[category][0] + "/" + FilenameUtils.getName(httpUri);
     }
 }
diff --git a/lib_core/src/main/assets/ac/-1324875_50c15374cd8f6.png b/lib_core/src/main/assets/ac/-1324875_50c15374cd8f6.png
deleted file mode 100644
index e47ff333a..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50c15374cd8f6.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50c1537cf22c8.png b/lib_core/src/main/assets/ac/-1324875_50c1537cf22c8.png
deleted file mode 100644
index 0f49d6d8c..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50c1537cf22c8.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50c153963eb38.png b/lib_core/src/main/assets/ac/-1324875_50c153963eb38.png
deleted file mode 100644
index c4c570e3c..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50c153963eb38.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50c153ad5bca3.png b/lib_core/src/main/assets/ac/-1324875_50c153ad5bca3.png
deleted file mode 100644
index 8eb070bd1..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50c153ad5bca3.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d84199dbdb2.png b/lib_core/src/main/assets/ac/-1324875_50d84199dbdb2.png
deleted file mode 100644
index 1f0de66df..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d84199dbdb2.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d8419e3e516.png b/lib_core/src/main/assets/ac/-1324875_50d8419e3e516.png
deleted file mode 100644
index c1b2837e4..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d8419e3e516.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841a1676ab.png b/lib_core/src/main/assets/ac/-1324875_50d841a1676ab.png
deleted file mode 100644
index e4fda5ebe..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841a1676ab.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841a969837.png b/lib_core/src/main/assets/ac/-1324875_50d841a969837.png
deleted file mode 100644
index 86ad68e60..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841a969837.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841ae691f0.png b/lib_core/src/main/assets/ac/-1324875_50d841ae691f0.png
deleted file mode 100644
index 8472a4a8f..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841ae691f0.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841b17b503.png b/lib_core/src/main/assets/ac/-1324875_50d841b17b503.png
deleted file mode 100644
index 1294cd503..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841b17b503.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841b488bcd.png b/lib_core/src/main/assets/ac/-1324875_50d841b488bcd.png
deleted file mode 100644
index af387a3b0..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841b488bcd.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841b7282dd.png b/lib_core/src/main/assets/ac/-1324875_50d841b7282dd.png
deleted file mode 100644
index 7fd0fc13b..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841b7282dd.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841ba3efd0.png b/lib_core/src/main/assets/ac/-1324875_50d841ba3efd0.png
deleted file mode 100644
index eb780928b..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50d841ba3efd0.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597cedefb0.png b/lib_core/src/main/assets/ac/-1324875_50e597cedefb0.png
deleted file mode 100644
index 68784a9b6..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597cedefb0.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597e217236.png b/lib_core/src/main/assets/ac/-1324875_50e597e217236.png
deleted file mode 100644
index bcabf4d7f..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597e217236.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597e645550.png b/lib_core/src/main/assets/ac/-1324875_50e597e645550.png
deleted file mode 100644
index 1318f54a8..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597e645550.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597edf1a10.png b/lib_core/src/main/assets/ac/-1324875_50e597edf1a10.png
deleted file mode 100644
index 6ffb37fa4..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597edf1a10.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597f190a11.png b/lib_core/src/main/assets/ac/-1324875_50e597f190a11.png
deleted file mode 100644
index 054d1dcb1..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597f190a11.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597f5ce78d.png b/lib_core/src/main/assets/ac/-1324875_50e597f5ce78d.png
deleted file mode 100644
index 9076d122b..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50e597f5ce78d.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe24fff3ca8.png b/lib_core/src/main/assets/ac/-1324875_50fe24fff3ca8.png
deleted file mode 100644
index d6332bef1..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe24fff3ca8.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe25031f595.png b/lib_core/src/main/assets/ac/-1324875_50fe25031f595.png
deleted file mode 100644
index 55baaa2d8..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe25031f595.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe2505d26ed.png b/lib_core/src/main/assets/ac/-1324875_50fe2505d26ed.png
deleted file mode 100644
index ce05bb8b3..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe2505d26ed.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe25088e9cb.png b/lib_core/src/main/assets/ac/-1324875_50fe25088e9cb.png
deleted file mode 100644
index ff043faed..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe25088e9cb.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe250b9488c.png b/lib_core/src/main/assets/ac/-1324875_50fe250b9488c.png
deleted file mode 100644
index d8d550ce9..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe250b9488c.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe250eca35e.png b/lib_core/src/main/assets/ac/-1324875_50fe250eca35e.png
deleted file mode 100644
index 846dbbf77..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe250eca35e.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe2511c5254.png b/lib_core/src/main/assets/ac/-1324875_50fe2511c5254.png
deleted file mode 100644
index 114c25118..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe2511c5254.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe2515354fd.png b/lib_core/src/main/assets/ac/-1324875_50fe2515354fd.png
deleted file mode 100644
index 9f5b4114c..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe2515354fd.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_50fe25191c370.png b/lib_core/src/main/assets/ac/-1324875_50fe25191c370.png
deleted file mode 100644
index 80a4ce0ac..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_50fe25191c370.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32e14f324.png b/lib_core/src/main/assets/ac/-1324875_510a32e14f324.png
deleted file mode 100644
index b14d3e2dd..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32e14f324.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32e41a1c9.png b/lib_core/src/main/assets/ac/-1324875_510a32e41a1c9.png
deleted file mode 100644
index 1d40b0c5d..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32e41a1c9.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32ea8cbd2.png b/lib_core/src/main/assets/ac/-1324875_510a32ea8cbd2.png
deleted file mode 100644
index 0b6b1b69f..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32ea8cbd2.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32ed356aa.png b/lib_core/src/main/assets/ac/-1324875_510a32ed356aa.png
deleted file mode 100644
index ab3c1a39a..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32ed356aa.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32f1a0345.png b/lib_core/src/main/assets/ac/-1324875_510a32f1a0345.png
deleted file mode 100644
index e3e5b0dfc..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32f1a0345.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a32f4bdcab.png b/lib_core/src/main/assets/ac/-1324875_510a32f4bdcab.png
deleted file mode 100644
index 49da3fd96..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a32f4bdcab.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_510a335b9300d.png b/lib_core/src/main/assets/ac/-1324875_510a335b9300d.png
deleted file mode 100644
index bcdbcf779..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_510a335b9300d.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_513394f5c39c4.png b/lib_core/src/main/assets/ac/-1324875_513394f5c39c4.png
deleted file mode 100644
index cea283e38..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_513394f5c39c4.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_513394f8d0005.png b/lib_core/src/main/assets/ac/-1324875_513394f8d0005.png
deleted file mode 100644
index 57f36aef4..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_513394f8d0005.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_513394ffb78e2.gif b/lib_core/src/main/assets/ac/-1324875_513394ffb78e2.gif
deleted file mode 100644
index 063eb763d..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_513394ffb78e2.gif and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_51339502d110b.gif b/lib_core/src/main/assets/ac/-1324875_51339502d110b.gif
deleted file mode 100644
index f6e129ae4..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_51339502d110b.gif and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_51339506d9c37.png b/lib_core/src/main/assets/ac/-1324875_51339506d9c37.png
deleted file mode 100644
index 05112d869..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_51339506d9c37.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_51339509ac4b4.png b/lib_core/src/main/assets/ac/-1324875_51339509ac4b4.png
deleted file mode 100644
index 2bbcdfd81..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_51339509ac4b4.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_5133950d008f9.png b/lib_core/src/main/assets/ac/-1324875_5133950d008f9.png
deleted file mode 100644
index 11a9230f6..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_5133950d008f9.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_514daeb78abaa.png b/lib_core/src/main/assets/ac/-1324875_514daeb78abaa.png
deleted file mode 100644
index 59ff27b13..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_514daeb78abaa.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-1324875_51505df66692d.png b/lib_core/src/main/assets/ac/-1324875_51505df66692d.png
deleted file mode 100644
index 671967725..000000000
Binary files a/lib_core/src/main/assets/ac/-1324875_51505df66692d.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc4cc6331.png b/lib_core/src/main/assets/ac/-47218_5052bc4cc6331.png
deleted file mode 100644
index 38ebd3c7b..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bc4cc6331.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc5579c24.png b/lib_core/src/main/assets/ac/-47218_5052bc5579c24.png
deleted file mode 100644
index caf3ef601..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bc5579c24.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc7a0ee49.png b/lib_core/src/main/assets/ac/-47218_5052bc7a0ee49.png
deleted file mode 100644
index 407ea84d9..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bc7a0ee49.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bca81a77f.png b/lib_core/src/main/assets/ac/-47218_5052bca81a77f.png
deleted file mode 100644
index d59ad807f..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bca81a77f.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcb093870.png b/lib_core/src/main/assets/ac/-47218_5052bcb093870.png
deleted file mode 100644
index 3bc23b9c5..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bcb093870.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcba15fcf.png b/lib_core/src/main/assets/ac/-47218_5052bcba15fcf.png
deleted file mode 100644
index 4401eba8a..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bcba15fcf.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcbe35760.png b/lib_core/src/main/assets/ac/-47218_5052bcbe35760.png
deleted file mode 100644
index 2641021c3..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bcbe35760.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bce7cf096.png b/lib_core/src/main/assets/ac/-47218_5052bce7cf096.png
deleted file mode 100644
index b8decdb30..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bce7cf096.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcee3d6b3.png b/lib_core/src/main/assets/ac/-47218_5052bcee3d6b3.png
deleted file mode 100644
index c50a422ff..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bcee3d6b3.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd2d0a416.png b/lib_core/src/main/assets/ac/-47218_5052bd2d0a416.png
deleted file mode 100644
index 6487ca8b1..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bd2d0a416.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd38bdf43.png b/lib_core/src/main/assets/ac/-47218_5052bd38bdf43.png
deleted file mode 100644
index db54b1202..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bd38bdf43.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd3b4b3bd.png b/lib_core/src/main/assets/ac/-47218_5052bd3b4b3bd.png
deleted file mode 100644
index f0bec5139..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bd3b4b3bd.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd40397e2.png b/lib_core/src/main/assets/ac/-47218_5052bd40397e2.png
deleted file mode 100644
index cf20339ed..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052bd40397e2.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052c0f41d155.png b/lib_core/src/main/assets/ac/-47218_5052c0f41d155.png
deleted file mode 100644
index 7182d66e0..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052c0f41d155.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052c10182a21.png b/lib_core/src/main/assets/ac/-47218_5052c10182a21.png
deleted file mode 100644
index 894b5c41f..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052c10182a21.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052c1076f119.png b/lib_core/src/main/assets/ac/-47218_5052c1076f119.png
deleted file mode 100644
index fc4af7d3c..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052c1076f119.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052c1156ec1c.png b/lib_core/src/main/assets/ac/-47218_5052c1156ec1c.png
deleted file mode 100644
index 010183141..000000000
Binary files a/lib_core/src/main/assets/ac/-47218_5052c1156ec1c.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/2aa114ca0804d12f2178e0dc69d4bc8a.png b/lib_core/src/main/assets/ac/2aa114ca0804d12f2178e0dc69d4bc8a.png
deleted file mode 100644
index 9e6ab7158..000000000
Binary files a/lib_core/src/main/assets/ac/2aa114ca0804d12f2178e0dc69d4bc8a.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/729647a27267ac7853056f99f35ecac7.png b/lib_core/src/main/assets/ac/729647a27267ac7853056f99f35ecac7.png
deleted file mode 100644
index c96fa7173..000000000
Binary files a/lib_core/src/main/assets/ac/729647a27267ac7853056f99f35ecac7.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/a6a581a8e4a61812ae123a837f4b0d88.png b/lib_core/src/main/assets/ac/a6a581a8e4a61812ae123a837f4b0d88.png
deleted file mode 100644
index e463abc90..000000000
Binary files a/lib_core/src/main/assets/ac/a6a581a8e4a61812ae123a837f4b0d88.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/ac0.png b/lib_core/src/main/assets/ac/ac0.png
new file mode 100644
index 000000000..ce1189161
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac0.png differ
diff --git a/lib_core/src/main/assets/ac/ac1.png b/lib_core/src/main/assets/ac/ac1.png
new file mode 100644
index 000000000..fe1a153c8
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac1.png differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc587c6f9.png b/lib_core/src/main/assets/ac/ac10.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc587c6f9.png
rename to lib_core/src/main/assets/ac/ac10.png
diff --git a/lib_core/src/main/assets/ac/ac11.png b/lib_core/src/main/assets/ac/ac11.png
new file mode 100644
index 000000000..f90f9cdc4
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac11.png differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd2497822.png b/lib_core/src/main/assets/ac/ac12.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd2497822.png
rename to lib_core/src/main/assets/ac/ac12.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd2fa0790.png b/lib_core/src/main/assets/ac/ac13.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd2fa0790.png
rename to lib_core/src/main/assets/ac/ac13.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052c0f6da079.png b/lib_core/src/main/assets/ac/ac14.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c0f6da079.png
rename to lib_core/src/main/assets/ac/ac14.png
diff --git a/lib_core/src/main/assets/ac/ac15.png b/lib_core/src/main/assets/ac/ac15.png
new file mode 100644
index 000000000..aafe41a8e
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac15.png differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcf37c4c9.png b/lib_core/src/main/assets/ac/ac16.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcf37c4c9.png
rename to lib_core/src/main/assets/ac/ac16.png
diff --git a/lib_core/src/main/assets/ac/-1324875_513394fbc54e1.gif b/lib_core/src/main/assets/ac/ac17.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-1324875_513394fbc54e1.gif
rename to lib_core/src/main/assets/ac/ac17.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc4f51be7.png b/lib_core/src/main/assets/ac/ac18.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc4f51be7.png
rename to lib_core/src/main/assets/ac/ac18.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052c1101747c.png b/lib_core/src/main/assets/ac/ac19.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c1101747c.png
rename to lib_core/src/main/assets/ac/ac19.png
diff --git a/lib_core/src/main/assets/ac/ac2.png b/lib_core/src/main/assets/ac/ac2.png
new file mode 100644
index 000000000..ebcb5263c
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac2.png differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052c10d1f08c.png b/lib_core/src/main/assets/ac/ac20.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c10d1f08c.png
rename to lib_core/src/main/assets/ac/ac20.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcdd279bc.png b/lib_core/src/main/assets/ac/ac21.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcdd279bc.png
rename to lib_core/src/main/assets/ac/ac21.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bce27ab4d.png b/lib_core/src/main/assets/ac/ac22.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bce27ab4d.png
rename to lib_core/src/main/assets/ac/ac22.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd35aec58.png b/lib_core/src/main/assets/ac/ac23.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd35aec58.png
rename to lib_core/src/main/assets/ac/ac23.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcdfd9c69.png b/lib_core/src/main/assets/ac/ac24.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcdfd9c69.png
rename to lib_core/src/main/assets/ac/ac24.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc835856c.png b/lib_core/src/main/assets/ac/ac25.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc835856c.png
rename to lib_core/src/main/assets/ac/ac25.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bce4f2963.png b/lib_core/src/main/assets/ac/ac26.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bce4f2963.png
rename to lib_core/src/main/assets/ac/ac26.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd330dfad.png b/lib_core/src/main/assets/ac/ac27.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd330dfad.png
rename to lib_core/src/main/assets/ac/ac27.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc7d91913.png b/lib_core/src/main/assets/ac/ac28.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc7d91913.png
rename to lib_core/src/main/assets/ac/ac28.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052c112b3b1b.png b/lib_core/src/main/assets/ac/ac29.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c112b3b1b.png
rename to lib_core/src/main/assets/ac/ac29.png
diff --git a/lib_core/src/main/assets/ac/ac3.png b/lib_core/src/main/assets/ac/ac3.png
new file mode 100644
index 000000000..b8872e134
Binary files /dev/null and b/lib_core/src/main/assets/ac/ac3.png differ
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcf0ba2db.png b/lib_core/src/main/assets/ac/ac30.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcf0ba2db.png
rename to lib_core/src/main/assets/ac/ac30.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc8638067.png b/lib_core/src/main/assets/ac/ac31.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc8638067.png
rename to lib_core/src/main/assets/ac/ac31.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bca55cb6e.png b/lib_core/src/main/assets/ac/ac32.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bca55cb6e.png
rename to lib_core/src/main/assets/ac/ac32.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc521c04b.png b/lib_core/src/main/assets/ac/ac33.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc521c04b.png
rename to lib_core/src/main/assets/ac/ac33.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bca2a2f43.png b/lib_core/src/main/assets/ac/ac34.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bca2a2f43.png
rename to lib_core/src/main/assets/ac/ac34.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcad49530.png b/lib_core/src/main/assets/ac/ac35.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcad49530.png
rename to lib_core/src/main/assets/ac/ac35.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bceb823da.png b/lib_core/src/main/assets/ac/ac36.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bceb823da.png
rename to lib_core/src/main/assets/ac/ac36.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bc80140e3.png b/lib_core/src/main/assets/ac/ac37.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bc80140e3.png
rename to lib_core/src/main/assets/ac/ac37.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcb3b8944.png b/lib_core/src/main/assets/ac/ac38.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcb3b8944.png
rename to lib_core/src/main/assets/ac/ac38.png
diff --git a/lib_core/src/main/assets/ac/-1324875_50d841a63a673.png b/lib_core/src/main/assets/ac/ac39.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-1324875_50d841a63a673.png
rename to lib_core/src/main/assets/ac/ac39.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcb6e96d1.png b/lib_core/src/main/assets/ac/ac4.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcb6e96d1.png
rename to lib_core/src/main/assets/ac/ac4.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcf68ddc2.png b/lib_core/src/main/assets/ac/ac40.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcf68ddc2.png
rename to lib_core/src/main/assets/ac/ac40.png
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597e9d6319.png b/lib_core/src/main/assets/ac/ac41.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-1324875_50e597e9d6319.png
rename to lib_core/src/main/assets/ac/ac41.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd27520ef.png b/lib_core/src/main/assets/ac/ac42.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd27520ef.png
rename to lib_core/src/main/assets/ac/ac42.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bd2a0d49a.png b/lib_core/src/main/assets/ac/ac5.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bd2a0d49a.png
rename to lib_core/src/main/assets/ac/ac5.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052c10aa0303.png b/lib_core/src/main/assets/ac/ac6.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c10aa0303.png
rename to lib_core/src/main/assets/ac/ac6.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052bcaaacb45.png b/lib_core/src/main/assets/ac/ac7.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052bcaaacb45.png
rename to lib_core/src/main/assets/ac/ac7.png
diff --git a/lib_core/src/main/assets/ac/-1324875_50e597c090c58.png b/lib_core/src/main/assets/ac/ac8.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-1324875_50e597c090c58.png
rename to lib_core/src/main/assets/ac/ac8.png
diff --git a/lib_core/src/main/assets/ac/-47218_5052c104b8e27.png b/lib_core/src/main/assets/ac/ac9.png
similarity index 100%
rename from lib_core/src/main/assets/ac/-47218_5052c104b8e27.png
rename to lib_core/src/main/assets/ac/ac9.png
diff --git a/lib_core/src/main/assets/ac/c1ceadd1553e140c2bc0348720cbb2df.png b/lib_core/src/main/assets/ac/c1ceadd1553e140c2bc0348720cbb2df.png
deleted file mode 100644
index 5e22b57d2..000000000
Binary files a/lib_core/src/main/assets/ac/c1ceadd1553e140c2bc0348720cbb2df.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ac/d6fc87f52b1d26d6768bcc0d8a7ec608.png b/lib_core/src/main/assets/ac/d6fc87f52b1d26d6768bcc0d8a7ec608.png
deleted file mode 100644
index 81dd7bf11..000000000
Binary files a/lib_core/src/main/assets/ac/d6fc87f52b1d26d6768bcc0d8a7ec608.png and /dev/null differ
diff --git a/lib_core/src/main/assets/ng/ng_1.png b/lib_core/src/main/assets/ng/ng_1.png
new file mode 100644
index 000000000..a76bb544b
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_1.png differ
diff --git a/lib_core/src/main/assets/ng/ng_10.png b/lib_core/src/main/assets/ng/ng_10.png
new file mode 100644
index 000000000..e438490c1
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_10.png differ
diff --git a/lib_core/src/main/assets/ng/ng_11.png b/lib_core/src/main/assets/ng/ng_11.png
new file mode 100644
index 000000000..74c71c853
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_11.png differ
diff --git a/lib_core/src/main/assets/ng/ng_12.png b/lib_core/src/main/assets/ng/ng_12.png
new file mode 100644
index 000000000..396c2157b
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_12.png differ
diff --git a/lib_core/src/main/assets/ng/ng_13.png b/lib_core/src/main/assets/ng/ng_13.png
new file mode 100644
index 000000000..a2b86cc88
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_13.png differ
diff --git a/lib_core/src/main/assets/ng/ng_14.png b/lib_core/src/main/assets/ng/ng_14.png
new file mode 100644
index 000000000..5b86039ec
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_14.png differ
diff --git a/lib_core/src/main/assets/ng/ng_15.png b/lib_core/src/main/assets/ng/ng_15.png
new file mode 100644
index 000000000..e1cf4ee3c
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_15.png differ
diff --git a/lib_core/src/main/assets/ng/ng_16.png b/lib_core/src/main/assets/ng/ng_16.png
new file mode 100644
index 000000000..0262730e1
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_16.png differ
diff --git a/lib_core/src/main/assets/ng/ng_17.png b/lib_core/src/main/assets/ng/ng_17.png
new file mode 100644
index 000000000..1ec5a6654
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_17.png differ
diff --git a/lib_core/src/main/assets/ng/ng_18.png b/lib_core/src/main/assets/ng/ng_18.png
new file mode 100644
index 000000000..4cac2e5cf
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_18.png differ
diff --git a/lib_core/src/main/assets/ng/ng_19.png b/lib_core/src/main/assets/ng/ng_19.png
new file mode 100644
index 000000000..3c887f2d7
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_19.png differ
diff --git a/lib_core/src/main/assets/ng/ng_2.png b/lib_core/src/main/assets/ng/ng_2.png
new file mode 100644
index 000000000..c66f6c9d6
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_2.png differ
diff --git a/lib_core/src/main/assets/ng/ng_20.png b/lib_core/src/main/assets/ng/ng_20.png
new file mode 100644
index 000000000..90fabfcce
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_20.png differ
diff --git a/lib_core/src/main/assets/ng/ng_21.png b/lib_core/src/main/assets/ng/ng_21.png
new file mode 100644
index 000000000..0d3c5d84d
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_21.png differ
diff --git a/lib_core/src/main/assets/ng/ng_22.png b/lib_core/src/main/assets/ng/ng_22.png
new file mode 100644
index 000000000..560aff650
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_22.png differ
diff --git a/lib_core/src/main/assets/ng/ng_23.png b/lib_core/src/main/assets/ng/ng_23.png
new file mode 100644
index 000000000..c3dc2b35f
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_23.png differ
diff --git a/lib_core/src/main/assets/ng/ng_24.png b/lib_core/src/main/assets/ng/ng_24.png
new file mode 100644
index 000000000..9cdbf6af3
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_24.png differ
diff --git a/lib_core/src/main/assets/ng/ng_25.png b/lib_core/src/main/assets/ng/ng_25.png
new file mode 100644
index 000000000..8fe5833a2
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_25.png differ
diff --git a/lib_core/src/main/assets/ng/ng_26.png b/lib_core/src/main/assets/ng/ng_26.png
new file mode 100644
index 000000000..38d768bd0
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_26.png differ
diff --git a/lib_core/src/main/assets/ng/ng_27.png b/lib_core/src/main/assets/ng/ng_27.png
new file mode 100644
index 000000000..01360ac45
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_27.png differ
diff --git a/lib_core/src/main/assets/ng/ng_28.png b/lib_core/src/main/assets/ng/ng_28.png
new file mode 100644
index 000000000..ff0e450d2
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_28.png differ
diff --git a/lib_core/src/main/assets/ng/ng_29.png b/lib_core/src/main/assets/ng/ng_29.png
new file mode 100644
index 000000000..c2264c78f
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_29.png differ
diff --git a/lib_core/src/main/assets/ng/ng_3.png b/lib_core/src/main/assets/ng/ng_3.png
new file mode 100644
index 000000000..3ef9fab6a
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_3.png differ
diff --git a/lib_core/src/main/assets/ng/ng_30.png b/lib_core/src/main/assets/ng/ng_30.png
new file mode 100644
index 000000000..3d949bab9
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_30.png differ
diff --git a/lib_core/src/main/assets/ng/ng_31.png b/lib_core/src/main/assets/ng/ng_31.png
new file mode 100644
index 000000000..1aaac9cf7
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_31.png differ
diff --git a/lib_core/src/main/assets/ng/ng_32.png b/lib_core/src/main/assets/ng/ng_32.png
new file mode 100644
index 000000000..b0e5c66a0
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_32.png differ
diff --git a/lib_core/src/main/assets/ng/ng_33.png b/lib_core/src/main/assets/ng/ng_33.png
new file mode 100644
index 000000000..e6da36173
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_33.png differ
diff --git a/lib_core/src/main/assets/ng/ng_34.png b/lib_core/src/main/assets/ng/ng_34.png
new file mode 100644
index 000000000..9d56d5ae5
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_34.png differ
diff --git a/lib_core/src/main/assets/ng/ng_35.png b/lib_core/src/main/assets/ng/ng_35.png
new file mode 100644
index 000000000..6263c2f76
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_35.png differ
diff --git a/lib_core/src/main/assets/ng/ng_36.png b/lib_core/src/main/assets/ng/ng_36.png
new file mode 100644
index 000000000..bfaea049b
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_36.png differ
diff --git a/lib_core/src/main/assets/ng/ng_37.png b/lib_core/src/main/assets/ng/ng_37.png
new file mode 100644
index 000000000..5d5032042
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_37.png differ
diff --git a/lib_core/src/main/assets/ng/ng_38.png b/lib_core/src/main/assets/ng/ng_38.png
new file mode 100644
index 000000000..ffe711b55
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_38.png differ
diff --git a/lib_core/src/main/assets/ng/ng_4.png b/lib_core/src/main/assets/ng/ng_4.png
new file mode 100644
index 000000000..a42b9eed7
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_4.png differ
diff --git a/lib_core/src/main/assets/ng/ng_5.png b/lib_core/src/main/assets/ng/ng_5.png
new file mode 100644
index 000000000..2f622a0b2
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_5.png differ
diff --git a/lib_core/src/main/assets/ng/ng_6.png b/lib_core/src/main/assets/ng/ng_6.png
new file mode 100644
index 000000000..b294a9932
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_6.png differ
diff --git a/lib_core/src/main/assets/ng/ng_7.png b/lib_core/src/main/assets/ng/ng_7.png
new file mode 100644
index 000000000..d817b2527
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_7.png differ
diff --git a/lib_core/src/main/assets/ng/ng_8.png b/lib_core/src/main/assets/ng/ng_8.png
new file mode 100644
index 000000000..938fdf7d8
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_8.png differ
diff --git a/lib_core/src/main/assets/ng/ng_9.png b/lib_core/src/main/assets/ng/ng_9.png
new file mode 100644
index 000000000..dd494f8de
Binary files /dev/null and b/lib_core/src/main/assets/ng/ng_9.png differ
diff --git a/lib_core/src/main/java/gov/anzong/androidnga/core/decode/ForumEmoticonDecoder.java b/lib_core/src/main/java/gov/anzong/androidnga/core/decode/ForumEmoticonDecoder.java
index c81b3164d..de765619e 100644
--- a/lib_core/src/main/java/gov/anzong/androidnga/core/decode/ForumEmoticonDecoder.java
+++ b/lib_core/src/main/java/gov/anzong/androidnga/core/decode/ForumEmoticonDecoder.java
@@ -22,29 +22,14 @@ public class ForumEmoticonDecoder implements IForumDecoder {
     };// (0-44)
 
     private static final String[] IMG_ADD_ACNIANG = {
-            "-47218_5052bca81a77f.png",
-            "-47218_5052bd3b4b3bd.png", "-1324875_50e597f5ce78d.png",
-            "-47218_5052bcba15fcf.png", "-47218_5052bcb6e96d1.png",
-            "-47218_5052bd2a0d49a.png", "-47218_5052c10aa0303.png",
-            "-47218_5052bcaaacb45.png", "-1324875_50e597c090c58.png",
-            "-47218_5052c104b8e27.png", "-47218_5052bc587c6f9.png",
-            "-47218_5052c1076f119.png", "-47218_5052bd2497822.png",
-            "-47218_5052bd2fa0790.png", "-47218_5052c0f6da079.png",
-            "-47218_5052bc4cc6331.png", "-47218_5052bcf37c4c9.png",
-            "-1324875_513394fbc54e1.gif", "-47218_5052bc4f51be7.png",
-            "-47218_5052c1101747c.png", "-47218_5052c10d1f08c.png",
-            "-47218_5052bcdd279bc.png", "-47218_5052bce27ab4d.png",
-            "-47218_5052bd35aec58.png", "-47218_5052bcdfd9c69.png",
-            "-47218_5052bc835856c.png", "-47218_5052bce4f2963.png",
-            "-47218_5052bd330dfad.png", "-47218_5052bc7d91913.png",
-            "-47218_5052c112b3b1b.png", "-47218_5052bcf0ba2db.png",
-            "-47218_5052bc8638067.png", "-47218_5052bca55cb6e.png",
-            "-47218_5052bc521c04b.png", "-47218_5052bca2a2f43.png",
-            "-47218_5052bcad49530.png", "-47218_5052bceb823da.png",
-            "-47218_5052bc80140e3.png", "-47218_5052bcb3b8944.png",
-            "-1324875_50d841a63a673.png", "-47218_5052bcf68ddc2.png",
-            "-1324875_50e597e9d6319.png", "-47218_5052bd27520ef.png",
-            "-47218_5052bcbe35760.png", "-1324875_50e597f190a11.png"// 0-44
+            "ac0.png", "ac1.png", "ac2.png", "ac3.png", "ac4.png", "ac5.png", "ac6.png",
+            "ac7.png", "ac8.png", "ac9.png", "ac10.png", "ac11.png", "ac12.png", "ac13.png",
+            "ac14.png", "ac15.png", "ac16.png", "ac17.png", "ac18.png", "ac19.png",
+            "ac20.png", "ac21.png", "ac22.png", "ac23.png", "ac24.png", "ac25.png",
+            "ac26.png", "ac27.png", "ac28.png", "ac29.png", "ac30.png", "ac31.png",
+            "ac32.png", "ac33.png", "ac34.png", "ac35.png", "ac36.png", "ac37.png",
+            "ac38.png", "ac39.png", "ac40.png", "ac41.png", "ac43.png", "ac42.png",
+            "ac44.png"// 0-44
     };
 
     private static final String[] UBB_CODE_ACNIANG_NEW = {
@@ -73,6 +58,21 @@ public class ForumEmoticonDecoder implements IForumDecoder {
             "a2_41.png", "a2_40.png",// 0-45
     };
 
+    private static final String UBB_CODE_NGNIANG[] = {
+                "呲牙笑", "奸笑", "问号", "茶", "笑指", "燃尽", "晕", "扇笑", "寄", "别急",
+                "doge", "丧", "汗", "叹气", "吃饼", "吃瓜", "吐舌", "哭", "喘", "心", "喷",
+                "困", "大哭", "大惊", "害怕", "惊", "暴怒", "气愤", "热", "瓜不熟", "瞎", "色",
+                "斜眼", "问号大"
+    };
+    private static final String IMG_ADD_NGNIANG[] = {
+            "ng_1.png", "ng_2.png", "ng_3.png", "ng_4.png", "ng_5.png", "ng_6.png",
+            "ng_7.png", "ng_8.png", "ng_9.png", "ng_10.png", "ng_11.png", "ng_12.png",
+            "ng_13.png", "ng_15.png", "ng_16.png", "ng_17.png", "ng_18.png", "ng_19.png",
+            "ng_20.png", "ng_21.png", "ng_22.png", "ng_24.png", "ng_25.png", "ng_26.png",
+            "ng_27.png", "ng_28.png", "ng_30.png", "ng_31.png", "ng_32.png", "ng_33.png",
+            "ng_34.png", "ng_35.png", "ng_37.png", "ng_38.png"
+    };
+
     private static final String[] UBB_CODE_PENGUIN = {
             "战斗力", "哈啤", "满分", "衰", "拒绝",
             "心", "严肃", "吃瓜", "嘣", "嘣2",
@@ -154,6 +154,10 @@ public class ForumEmoticonDecoder implements IForumDecoder {
             sEmotionTable.put("a2", UBB_CODE_ACNIANG_NEW[i], IMG_ADD_ACNIANG_NEW[i]);
         }
 
+        for (int i = 0; i < UBB_CODE_NGNIANG.length; i++) {
+            sEmotionTable.put("ng", UBB_CODE_NGNIANG[i], IMG_ADD_NGNIANG[i]);
+        }
+
         for (int i = 0; i < UBB_CODE_PST.length; i++) {
             sEmotionTable.put("pst", UBB_CODE_PST[i], IMG_ADD_PST[i]);
         }
diff --git a/nga_phone_base_3.0/src/main/java/sp/phone/mvp/presenter/TopicPostPresenter.java b/nga_phone_base_3.0/src/main/java/sp/phone/mvp/presenter/TopicPostPresenter.java
index ee86bfd5a..5e327bedc 100644
--- a/nga_phone_base_3.0/src/main/java/sp/phone/mvp/presenter/TopicPostPresenter.java
+++ b/nga_phone_base_3.0/src/main/java/sp/phone/mvp/presenter/TopicPostPresenter.java
@@ -42,56 +42,25 @@ public class TopicPostPresenter extends BasePresenter<TopicPostFragment, TopicPo
 
     @Override
     public void setEmoticon(String emotion) {
-        String urlTemp = emotion.replaceAll("\\n", "");
-        if (urlTemp.contains("http")) {
-            urlTemp = urlTemp.substring(5, urlTemp.length() - 6);
-            String sourceFile = EmoticonUtils.getPathByURI(urlTemp);
-            try (InputStream is = mBaseView.getContext().getResources().getAssets().open(sourceFile)) {
-                if (is != null) {
-                    Bitmap bitmap = BitmapFactory.decodeStream(is);
-                    Drawable drawable = new BitmapDrawable(mBaseView.getContext().getResources(), bitmap);
-                    drawable.setBounds(0, 0, drawable.getIntrinsicWidth(),
-                            drawable.getIntrinsicHeight());
-                    SpannableString spanString = new SpannableString(emotion);
-                    ImageSpan span = new ImageSpan(drawable,
-                            ImageSpan.ALIGN_BASELINE);
-                    spanString.setSpan(span, 0, emotion.length(),
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    mBaseView.insertBodyText(spanString);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            int[] emotions = {1, 2, 3, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34,
-                    35, 36, 37, 38, 39, 4, 40, 41, 42, 43, 5, 6, 7, 8};
-            for (int i = 0; i < 27; i++) {
-                if (emotion.indexOf("[s:" + emotions[i] + "]") == 0) {
-                    String sourceFile = "a" + emotions[i] + ".gif";
-                    try (InputStream is = mBaseView.getContext().getResources().getAssets().open(sourceFile)) {
-                        if (is != null) {
-                            Bitmap bitmap = BitmapFactory.decodeStream(is);
-                            Drawable drawable = new BitmapDrawable(bitmap);
-                            drawable.setBounds(0, 0, drawable.getIntrinsicWidth(),
-                                    drawable.getIntrinsicHeight());
-                            SpannableString spanString = new SpannableString(
-                                    emotion);
-                            ImageSpan span = new ImageSpan(drawable,
-                                    ImageSpan.ALIGN_BASELINE);
-                            spanString.setSpan(span, 0, emotion.length(),
-                                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                            mBaseView.insertBodyText(spanString);
-                        } else {
-                            mBaseView.insertBodyText(emotion);
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                    break;
-                }
+        String[] emotions = emotion.split("-");
+        try (InputStream is = mBaseView.getContext().getResources().getAssets().open(emotions[1])) {
+            if (is != null) {
+                Bitmap bitmap = BitmapFactory.decodeStream(is);
+                Drawable drawable = new BitmapDrawable(mBaseView.getContext().getResources(), bitmap);
+                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(),
+                        drawable.getIntrinsicHeight());
+                SpannableString spanString = new SpannableString(emotions[0]);
+                ImageSpan span = new ImageSpan(drawable,
+                        ImageSpan.ALIGN_BASELINE);
+                spanString.setSpan(span, 0, emotions[0].length(),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                mBaseView.insertBodyText(spanString);
             }
+        } catch (IOException e) {
+            e.printStackTrace();
         }
+
+
     }//
 
     @Override
@@ -140,7 +109,7 @@ public void post(String title, String body, boolean isAnony) {
 
     @Override
     public void showFilePicker() {
-        PermissionUtils.request(mBaseView, new BaseSubscriber<Boolean>(){
+        PermissionUtils.request(mBaseView, new BaseSubscriber<Boolean>() {
 
             @Override
             public void onNext(Boolean aBoolean) {
diff --git a/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonChildAdapter.java b/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonChildAdapter.java
index 9cd287cd6..3a89a6243 100644
--- a/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonChildAdapter.java
+++ b/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonChildAdapter.java
@@ -1,5 +1,7 @@
 package sp.phone.ui.adapter;
 
+import static gov.anzong.androidnga.common.util.EmoticonUtils.EMOTICON_LABEL;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -31,6 +33,7 @@ public class EmoticonChildAdapter extends RecyclerView.Adapter<EmoticonChildAdap
 
     private String[] mImageUrls;
 
+    private String[] mEmotionCodes;
     private String mCategoryName;
 
     private int mHeight;
@@ -50,8 +53,9 @@ public EmoticonChildAdapter(Context context, int height) {
         isNightMode = ThemeManager.getInstance().isNightMode();
     }
 
-    public void setData(String categoryName, String[] urls) {
+    public void setData(String categoryName, String[] urls, String[] codes) {
         mImageUrls = urls;
+        mEmotionCodes = codes;
         mCategoryName = categoryName;
     }
 
@@ -82,7 +86,8 @@ public void onBindViewHolder(EmoticonViewHolder holder, int position) {
                 }
             }
             holder.mEmoticonItem.setImageBitmap(bm);
-            holder.mEmoticonItem.setTag("[img]" + mImageUrls[position] + "[/img]");
+            holder.mEmoticonItem.setTag(mEmotionCodes[position] +
+                    "-" + mCategoryName + "/" + mImageUrls[position]);
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonParentAdapter.java b/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonParentAdapter.java
index 02ad5f897..73668e819 100644
--- a/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonParentAdapter.java
+++ b/nga_phone_base_3.0/src/main/java/sp/phone/ui/adapter/EmoticonParentAdapter.java
@@ -1,5 +1,7 @@
 package sp.phone.ui.adapter;
 
+import static gov.anzong.androidnga.common.util.EmoticonUtils.EMOTICON_LABEL;
+
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,7 +35,10 @@ public Object instantiateItem(ViewGroup container, int position) {
         recyclerView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
         EmoticonChildAdapter adapter = new EmoticonChildAdapter(mContext, mHeight);
-        adapter.setData(EmoticonUtils.EMOTICON_LABEL[position][0], EmoticonUtils.EMOTICON_URL[position]);
+
+        adapter.setData(EMOTICON_LABEL[position][0], getEmotionList(EmoticonUtils.EMOTICON_URL[position], position, 1),
+                getEmotionList(EmoticonUtils.EMOTICON_URL[position], position, 0)
+        );
 
         recyclerView.setAdapter(adapter);
 
@@ -43,7 +48,22 @@ public Object instantiateItem(ViewGroup container, int position) {
 
     @Override
     public CharSequence getPageTitle(int position) {
-        return EmoticonUtils.EMOTICON_LABEL[position][1];
+        return EMOTICON_LABEL[position][1];
+    }
+
+    private String[] getEmotionList(String[][] list, int emotionPosion, int emotionType) {
+        String[] result = new String[list.length];
+        if (emotionType == 0) {
+            for (int i = 0; i < list.length; i++) {
+                result[i] = "[s:" + EmoticonUtils.EMOTICON_LABEL[emotionPosion][0] + ":" + list[i][emotionType] + "]";
+            }
+        } else {
+            for (int i = 0; i < list.length; i++) {
+                result[i] = list[i][emotionType];
+            }
+        }
+
+        return result;
     }
 
     @Override
@@ -54,7 +74,7 @@ public void destroyItem(ViewGroup container, int position, Object object) {
 
     @Override
     public int getCount() {
-        return EmoticonUtils.EMOTICON_LABEL.length;
+        return EMOTICON_LABEL.length;
     }
 
     @Override
diff --git a/nga_phone_base_3.0/src/main/java/sp/phone/util/StringUtils.java b/nga_phone_base_3.0/src/main/java/sp/phone/util/StringUtils.java
index 1cc59f29c..c397dba09 100644
--- a/nga_phone_base_3.0/src/main/java/sp/phone/util/StringUtils.java
+++ b/nga_phone_base_3.0/src/main/java/sp/phone/util/StringUtils.java
@@ -505,29 +505,15 @@ private static String buildEmoticonImage(String content) {
                 "哭笑", "哼", "喘", "喷", "嘲笑", "嘲笑1", "囧", "委屈", "心", "忧伤", "怒",
                 "怕", "惊", "愁", "抓狂", "抠鼻", "擦汗", "无语", "晕", "汗", "瞎", "羞",
                 "羡慕", "花痴", "茶", "衰", "计划通", "赞同", "闪光", "黑枪"};// (0-44)
-        final String acniangappadd[] = {"-47218_5052bca81a77f.png",
-                "-47218_5052bd3b4b3bd.png", "-1324875_50e597f5ce78d.png",
-                "-47218_5052bcba15fcf.png", "-47218_5052bcb6e96d1.png",
-                "-47218_5052bd2a0d49a.png", "-47218_5052c10aa0303.png",
-                "-47218_5052bcaaacb45.png", "-1324875_50e597c090c58.png",
-                "-47218_5052c104b8e27.png", "-47218_5052bc587c6f9.png",
-                "-47218_5052c1076f119.png", "-47218_5052bd2497822.png",
-                "-47218_5052bd2fa0790.png", "-47218_5052c0f6da079.png",
-                "-47218_5052bc4cc6331.png", "-47218_5052bcf37c4c9.png",
-                "-1324875_513394fbc54e1.gif", "-47218_5052bc4f51be7.png",
-                "-47218_5052c1101747c.png", "-47218_5052c10d1f08c.png",
-                "-47218_5052bcdd279bc.png", "-47218_5052bce27ab4d.png",
-                "-47218_5052bd35aec58.png", "-47218_5052bcdfd9c69.png",
-                "-47218_5052bc835856c.png", "-47218_5052bce4f2963.png",
-                "-47218_5052bd330dfad.png", "-47218_5052bc7d91913.png",
-                "-47218_5052c112b3b1b.png", "-47218_5052bcf0ba2db.png",
-                "-47218_5052bc8638067.png", "-47218_5052bca55cb6e.png",
-                "-47218_5052bc521c04b.png", "-47218_5052bca2a2f43.png",
-                "-47218_5052bcad49530.png", "-47218_5052bceb823da.png",
-                "-47218_5052bc80140e3.png", "-47218_5052bcb3b8944.png",
-                "-1324875_50d841a63a673.png", "-47218_5052bcf68ddc2.png",
-                "-1324875_50e597e9d6319.png", "-47218_5052bd27520ef.png",
-                "-47218_5052bcbe35760.png", "-1324875_50e597f190a11.png"// 0-44
+        final String acniangappadd[] = {
+                "ac0.png", "ac1.png", "ac2.png", "ac3.png", "ac4.png", "ac5.png", "ac6.png",
+                "ac7.png", "ac8.png", "ac9.png", "ac10.png", "ac11.png", "ac12.png", "ac13.png",
+                "ac14.png", "ac15.png", "ac16.png", "ac17.png", "ac18.png", "ac19.png",
+                "ac20.png", "ac21.png", "ac22.png", "ac23.png", "ac24.png", "ac25.png",
+                "ac26.png", "ac27.png", "ac28.png", "ac29.png", "ac30.png", "ac31.png",
+                "ac32.png", "ac33.png", "ac34.png", "ac35.png", "ac36.png", "ac37.png",
+                "ac38.png", "ac39.png", "ac40.png", "ac41.png", "ac43.png", "ac42.png",
+                "ac44.png"
         };
         final String newacniangofubbcode[] = {
                 "goodjob", "诶嘿", "偷笑", "怒", "笑",
@@ -551,6 +537,20 @@ private static String buildEmoticonImage(String content) {
                 "a2_22.png", "a2_42.png", "a2_37.png", "a2_38.png", "a2_39.png",
                 "a2_41.png", "a2_40.png",// 0-45
         };
+        final String ngniangBBCode[] = {
+                "呲牙笑", "奸笑", "问号", "茶", "笑指", "燃尽", "晕", "扇笑", "寄", "别急",
+                "doge", "丧", "汗", "叹气", "吃饼", "吃瓜", "吐舌", "哭", "喘", "心", "喷",
+                "困", "大哭", "大惊", "害怕", "惊", "暴怒", "气愤", "热", "瓜不熟", "瞎", "色",
+                "斜眼", "问号大"
+        };
+        final String ngniangAppAdd[] = {
+                "ng_1.png", "ng_2.png", "ng_3.png", "ng_4.png", "ng_5.png", "ng_6.png",
+                "ng_7.png", "ng_8.png", "ng_9.png", "ng_10.png", "ng_11.png", "ng_12.png",
+                "ng_13.png", "ng_15.png", "ng_16.png", "ng_17.png", "ng_18.png", "ng_19.png",
+                "ng_20.png", "ng_21.png", "ng_22.png", "ng_24.png", "ng_25.png", "ng_26.png",
+                "ng_27.png", "ng_28.png", "ng_30.png", "ng_31.png", "ng_32.png", "ng_33.png",
+                "ng_34.png", "ng_35.png", "ng_37.png", "ng_38.png"
+        };
         final String penguinOfUBBCode[] = {
                 "战斗力", "哈啤", "满分", "衰", "拒绝",
                 "心", "严肃", "吃瓜", "嘣", "嘣2",
@@ -608,14 +608,19 @@ private static String buildEmoticonImage(String content) {
         };
         for (int i = 0; i < 45; i++) {
             content = content.replaceAll(ignoreCaseTag + "\\[s:ac:" + acniangofubbcode[i]
-                    + "]", "<img src='file:///android_asset/acniang/"
+                    + "]", "<img src= file:///android_asset/ac/"
                     + acniangappadd[i] + "'>");
         }
         for (int i = 0; i < 46; i++) {
             content = content.replaceAll(ignoreCaseTag + "\\[s:a2:" + newacniangofubbcode[i]
-                    + "]", "<img src='file:///android_asset/newacniang/"
+                    + "]", "<img src='file:///android_asset/a2/"
                     + newacniangappadd[i] + "'>");
         }
+        for (int i = 0; i < penguinOfUBBCode.length; i++) {
+            content = content.replaceAll(ignoreCaseTag + "\\[s:ng:" + ngniangBBCode[i]
+                    + "]", "<img src='file:///android_asset/ng/"
+                    + ngniangAppAdd[i] + "' width=" + 60 + " height=" + 60 + ">");
+        }
         for (int i = 0; i < penguinOfUBBCode.length; i++) {
             content = content.replaceAll(ignoreCaseTag + "\\[s:pg:" + penguinOfUBBCode[i]
                     + "]", "<img src='file:///android_asset/pg/"