diff --git a/public/images/emoticon/18/10.gif b/public/images/emoticon/18/10.gif
index a0bbae54f..51d3ac90b 100644
Binary files a/public/images/emoticon/18/10.gif and b/public/images/emoticon/18/10.gif differ
diff --git a/public/images/emoticon/18/12.gif b/public/images/emoticon/18/12.gif
index 69fa0ad3d..a54178410 100644
Binary files a/public/images/emoticon/18/12.gif and b/public/images/emoticon/18/12.gif differ
diff --git a/public/images/emoticon/18/15.gif b/public/images/emoticon/18/15.gif
index 78af8fb37..47d7abea1 100644
Binary files a/public/images/emoticon/18/15.gif and b/public/images/emoticon/18/15.gif differ
diff --git a/public/images/emoticon/18/26.gif b/public/images/emoticon/18/26.gif
index 4d2d65e09..094d4ecd9 100644
Binary files a/public/images/emoticon/18/26.gif and b/public/images/emoticon/18/26.gif differ
diff --git a/public/images/emoticon/18/35.gif b/public/images/emoticon/18/35.gif
new file mode 100644
index 000000000..df056db05
Binary files /dev/null and b/public/images/emoticon/18/35.gif differ
diff --git a/public/images/emoticon/18/36.gif b/public/images/emoticon/18/36.gif
new file mode 100644
index 000000000..99cfd443f
Binary files /dev/null and b/public/images/emoticon/18/36.gif differ
diff --git a/public/images/emoticon/18/37.gif b/public/images/emoticon/18/37.gif
new file mode 100644
index 000000000..5db50b254
Binary files /dev/null and b/public/images/emoticon/18/37.gif differ
diff --git a/public/images/emoticon/18/38.gif b/public/images/emoticon/18/38.gif
new file mode 100644
index 000000000..f612a190a
Binary files /dev/null and b/public/images/emoticon/18/38.gif differ
diff --git a/public/images/emoticon/18/39.gif b/public/images/emoticon/18/39.gif
new file mode 100644
index 000000000..75ffdd08b
Binary files /dev/null and b/public/images/emoticon/18/39.gif differ
diff --git a/public/images/emoticon/18/40.gif b/public/images/emoticon/18/40.gif
new file mode 100644
index 000000000..d2f865539
Binary files /dev/null and b/public/images/emoticon/18/40.gif differ
diff --git a/public/images/emoticon/18/41.gif b/public/images/emoticon/18/41.gif
new file mode 100644
index 000000000..e1578ab30
Binary files /dev/null and b/public/images/emoticon/18/41.gif differ
diff --git a/public/images/emoticon/18/42.gif b/public/images/emoticon/18/42.gif
new file mode 100644
index 000000000..50b3df524
Binary files /dev/null and b/public/images/emoticon/18/42.gif differ
diff --git a/public/images/emoticon/18/43.gif b/public/images/emoticon/18/43.gif
new file mode 100644
index 000000000..b7ec55cdc
Binary files /dev/null and b/public/images/emoticon/18/43.gif differ
diff --git a/public/images/emoticon/18/44.gif b/public/images/emoticon/18/44.gif
new file mode 100644
index 000000000..e3cf98415
Binary files /dev/null and b/public/images/emoticon/18/44.gif differ
diff --git a/public/images/emoticon/18/45.gif b/public/images/emoticon/18/45.gif
new file mode 100644
index 000000000..49676d318
Binary files /dev/null and b/public/images/emoticon/18/45.gif differ
diff --git a/public/images/emoticon/18/46.gif b/public/images/emoticon/18/46.gif
new file mode 100644
index 000000000..de6913e5d
Binary files /dev/null and b/public/images/emoticon/18/46.gif differ
diff --git a/public/images/emoticon/18/47.gif b/public/images/emoticon/18/47.gif
new file mode 100644
index 000000000..90abbe801
Binary files /dev/null and b/public/images/emoticon/18/47.gif differ
diff --git a/public/images/emoticon/18/48.gif b/public/images/emoticon/18/48.gif
new file mode 100644
index 000000000..2d08e3727
Binary files /dev/null and b/public/images/emoticon/18/48.gif differ
diff --git a/public/js/emoticon.all.js b/public/js/emoticon.all.js
index 3b2d0bc6d..3bbee3d88 100644
--- a/public/js/emoticon.all.js
+++ b/public/js/emoticon.all.js
@@ -14,12 +14,12 @@
                 {"name": "打卡啦", "key": "打卡 上班 报 记得打卡", "path": "7.gif"},
                 {"name": "冒泡中", "key": "冒泡 浮出水面 发生了啥 八卦 露头 怎么个事 怎么了", "path": "8.gif"},
                 {"name": "疑问", "key": "真的 质疑 眼神 不确定 给你个眼神", "path": "9.gif"},
-                {"name": "谢谢老板", "key": "新年好 新年 拜年 恭喜发财", "path": "10.gif"},
+                {"name": "恭喜发财", "key": "新年好 新年 拜年", "path": "10.gif"},
                 {"name": "非常感谢", "key": "谢谢 感动 跪 多谢 THANKS THANK YOU 谢了", "path": "11.gif"},
-                {"name": "在吗", "key": "Hi 打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
+                {"name": "Hi", "key": "打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
                 {"name": "欢迎", "key": "新人 兴奋 开心 庆祝 喝彩 气氛组", "path": "13.gif"},
                 {"name": "加油", "key": "喝彩 气氛组", "path": "14.gif"},
-                {"name": "哇~", "key": "看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
+                {"name": "静静", "key": "看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
                 {"name": "开会啦", "key": "会 通知 敲锣 开会 开会了", "path": "16.gif"},
                 {"name": "可以吗", "key": "害羞 不好意思 脸红 可以 可以不", "path": "17.gif"},
                 {"name": "帅", "key": "自信 迷之自信 自我欣赏 自恋 我真帅", "path": "18.gif"},
@@ -30,7 +30,7 @@
                 {"name": "撒花", "key": "欢迎 花 开心 耶 真好 真棒", "path": "23.gif"},
                 {"name": "生日快乐", "key": "吃蛋糕 蛋糕 生日", "path": "24.gif"},
                 {"name": "OK", "key": "明白 收到 好的 收 已阅 已读", "path": "25.gif"},
-                {"name": "谢谢", "key": "送花 送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
+                {"name": "送花", "key": "送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
                 {"name": "在线吃瓜", "key": "八卦 看戏 看热闹 吃瓜 凑热闹 吃瓜群众 围观", "path": "27.gif"},
                 {"name": "我错了", "key": "错了 哭 难过 悲伤 认错 对不起 道歉", "path": "28.gif"},
                 {"name": "我太难了", "key": "太难了 难过 不开心 委屈", "path": "29.gif"},
@@ -38,7 +38,21 @@
                 {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助 给点吧", "path": "31.gif"},
                 {"name": "幸福", "key": "满足 洗澡 泡澡 开心", "path": "32.gif"},
                 {"name": "赞", "key": "大拇指 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒 6 666 牛", "path": "33.gif"},
-                {"name": "下班", "key": "闪人 走人 溜人 走了 关机", "path": "34.gif"}
+                {"name": "下班", "key": "闪人 走人 溜人 走了 关机", "path": "34.gif"},
+                {"name": "投降", "key": "认输 屈服 妥协", "path": "35.gif"},
+                {"name": "发生了啥", "key": "八卦 我看看 怎么个事 怎么了", "path": "36.gif"},
+                {"name": "吃饭", "key": "干饭 约饭吗 一起吃饭", "path": "37.gif"},
+                {"name": "请付款", "key": "微信还是支付宝 请扫码 扫一扫 扫码支付", "path": "38.gif"},
+                {"name": "不想上班", "key": "讨厌上班 累了 不愿意 休息", "path": "39.gif"},
+                {"name": "功德加一", "key": "积德 行善", "path": "40.gif"},
+                {"name": "惯的你", "key": "生气 打你 发火", "path": "41.gif"},
+                {"name": "嗨起来", "key": "动起来 热闹 欢快 开心", "path": "42.gif"},
+                {"name": "加一", "key": "我也要 一样 再来一份", "path": "43.gif"},
+                {"name": "明天放假", "key": "放假啦 休息 开心 激动", "path": "44.gif"},
+                {"name": "先走了", "key": "滚了 告退 撤了", "path": "45.gif"},
+                {"name": "马上到", "key": "在路上 一会到 就到", "path": "46.gif"},
+                {"name": "震惊", "key": "惊讶 震撼 吃惊 诧异 不敢相信", "path": "47.gif"},
+                {"name": "晕了", "key": "绕晕 麻木 迷糊", "path": "48.gif"}
             ]
         },
         {
diff --git a/resources/assets/statics/public/images/emoticon/18/10.gif b/resources/assets/statics/public/images/emoticon/18/10.gif
index a0bbae54f..51d3ac90b 100644
Binary files a/resources/assets/statics/public/images/emoticon/18/10.gif and b/resources/assets/statics/public/images/emoticon/18/10.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/12.gif b/resources/assets/statics/public/images/emoticon/18/12.gif
index 69fa0ad3d..a54178410 100644
Binary files a/resources/assets/statics/public/images/emoticon/18/12.gif and b/resources/assets/statics/public/images/emoticon/18/12.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/15.gif b/resources/assets/statics/public/images/emoticon/18/15.gif
index 78af8fb37..47d7abea1 100644
Binary files a/resources/assets/statics/public/images/emoticon/18/15.gif and b/resources/assets/statics/public/images/emoticon/18/15.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/26.gif b/resources/assets/statics/public/images/emoticon/18/26.gif
index 4d2d65e09..094d4ecd9 100644
Binary files a/resources/assets/statics/public/images/emoticon/18/26.gif and b/resources/assets/statics/public/images/emoticon/18/26.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/35.gif b/resources/assets/statics/public/images/emoticon/18/35.gif
new file mode 100644
index 000000000..df056db05
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/35.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/36.gif b/resources/assets/statics/public/images/emoticon/18/36.gif
new file mode 100644
index 000000000..99cfd443f
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/36.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/37.gif b/resources/assets/statics/public/images/emoticon/18/37.gif
new file mode 100644
index 000000000..5db50b254
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/37.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/38.gif b/resources/assets/statics/public/images/emoticon/18/38.gif
new file mode 100644
index 000000000..f612a190a
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/38.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/39.gif b/resources/assets/statics/public/images/emoticon/18/39.gif
new file mode 100644
index 000000000..75ffdd08b
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/39.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/40.gif b/resources/assets/statics/public/images/emoticon/18/40.gif
new file mode 100644
index 000000000..d2f865539
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/40.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/41.gif b/resources/assets/statics/public/images/emoticon/18/41.gif
new file mode 100644
index 000000000..e1578ab30
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/41.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/42.gif b/resources/assets/statics/public/images/emoticon/18/42.gif
new file mode 100644
index 000000000..50b3df524
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/42.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/43.gif b/resources/assets/statics/public/images/emoticon/18/43.gif
new file mode 100644
index 000000000..b7ec55cdc
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/43.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/44.gif b/resources/assets/statics/public/images/emoticon/18/44.gif
new file mode 100644
index 000000000..e3cf98415
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/44.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/45.gif b/resources/assets/statics/public/images/emoticon/18/45.gif
new file mode 100644
index 000000000..49676d318
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/45.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/46.gif b/resources/assets/statics/public/images/emoticon/18/46.gif
new file mode 100644
index 000000000..de6913e5d
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/46.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/47.gif b/resources/assets/statics/public/images/emoticon/18/47.gif
new file mode 100644
index 000000000..90abbe801
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/47.gif differ
diff --git a/resources/assets/statics/public/images/emoticon/18/48.gif b/resources/assets/statics/public/images/emoticon/18/48.gif
new file mode 100644
index 000000000..2d08e3727
Binary files /dev/null and b/resources/assets/statics/public/images/emoticon/18/48.gif differ
diff --git a/resources/assets/statics/public/js/emoticon.all.js b/resources/assets/statics/public/js/emoticon.all.js
index 3b2d0bc6d..3bbee3d88 100644
--- a/resources/assets/statics/public/js/emoticon.all.js
+++ b/resources/assets/statics/public/js/emoticon.all.js
@@ -14,12 +14,12 @@
                 {"name": "打卡啦", "key": "打卡 上班 报 记得打卡", "path": "7.gif"},
                 {"name": "冒泡中", "key": "冒泡 浮出水面 发生了啥 八卦 露头 怎么个事 怎么了", "path": "8.gif"},
                 {"name": "疑问", "key": "真的 质疑 眼神 不确定 给你个眼神", "path": "9.gif"},
-                {"name": "谢谢老板", "key": "新年好 新年 拜年 恭喜发财", "path": "10.gif"},
+                {"name": "恭喜发财", "key": "新年好 新年 拜年", "path": "10.gif"},
                 {"name": "非常感谢", "key": "谢谢 感动 跪 多谢 THANKS THANK YOU 谢了", "path": "11.gif"},
-                {"name": "在吗", "key": "Hi 打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
+                {"name": "Hi", "key": "打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
                 {"name": "欢迎", "key": "新人 兴奋 开心 庆祝 喝彩 气氛组", "path": "13.gif"},
                 {"name": "加油", "key": "喝彩 气氛组", "path": "14.gif"},
-                {"name": "哇~", "key": "看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
+                {"name": "静静", "key": "看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
                 {"name": "开会啦", "key": "会 通知 敲锣 开会 开会了", "path": "16.gif"},
                 {"name": "可以吗", "key": "害羞 不好意思 脸红 可以 可以不", "path": "17.gif"},
                 {"name": "帅", "key": "自信 迷之自信 自我欣赏 自恋 我真帅", "path": "18.gif"},
@@ -30,7 +30,7 @@
                 {"name": "撒花", "key": "欢迎 花 开心 耶 真好 真棒", "path": "23.gif"},
                 {"name": "生日快乐", "key": "吃蛋糕 蛋糕 生日", "path": "24.gif"},
                 {"name": "OK", "key": "明白 收到 好的 收 已阅 已读", "path": "25.gif"},
-                {"name": "谢谢", "key": "送花 送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
+                {"name": "送花", "key": "送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
                 {"name": "在线吃瓜", "key": "八卦 看戏 看热闹 吃瓜 凑热闹 吃瓜群众 围观", "path": "27.gif"},
                 {"name": "我错了", "key": "错了 哭 难过 悲伤 认错 对不起 道歉", "path": "28.gif"},
                 {"name": "我太难了", "key": "太难了 难过 不开心 委屈", "path": "29.gif"},
@@ -38,7 +38,21 @@
                 {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助 给点吧", "path": "31.gif"},
                 {"name": "幸福", "key": "满足 洗澡 泡澡 开心", "path": "32.gif"},
                 {"name": "赞", "key": "大拇指 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒 6 666 牛", "path": "33.gif"},
-                {"name": "下班", "key": "闪人 走人 溜人 走了 关机", "path": "34.gif"}
+                {"name": "下班", "key": "闪人 走人 溜人 走了 关机", "path": "34.gif"},
+                {"name": "投降", "key": "认输 屈服 妥协", "path": "35.gif"},
+                {"name": "发生了啥", "key": "八卦 我看看 怎么个事 怎么了", "path": "36.gif"},
+                {"name": "吃饭", "key": "干饭 约饭吗 一起吃饭", "path": "37.gif"},
+                {"name": "请付款", "key": "微信还是支付宝 请扫码 扫一扫 扫码支付", "path": "38.gif"},
+                {"name": "不想上班", "key": "讨厌上班 累了 不愿意 休息", "path": "39.gif"},
+                {"name": "功德加一", "key": "积德 行善", "path": "40.gif"},
+                {"name": "惯的你", "key": "生气 打你 发火", "path": "41.gif"},
+                {"name": "嗨起来", "key": "动起来 热闹 欢快 开心", "path": "42.gif"},
+                {"name": "加一", "key": "我也要 一样 再来一份", "path": "43.gif"},
+                {"name": "明天放假", "key": "放假啦 休息 开心 激动", "path": "44.gif"},
+                {"name": "先走了", "key": "滚了 告退 撤了", "path": "45.gif"},
+                {"name": "马上到", "key": "在路上 一会到 就到", "path": "46.gif"},
+                {"name": "震惊", "key": "惊讶 震撼 吃惊 诧异 不敢相信", "path": "47.gif"},
+                {"name": "晕了", "key": "绕晕 麻木 迷糊", "path": "48.gif"}
             ]
         },
         {