diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index e931917d4..846e26042 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -431,6 +431,16 @@
         <file>smileys/wink.png</file>
         <file>smileys/wondering.png</file>
         <file>smileys/emotes.acs</file>
+        <file>smileys/rain.png</file>
+        <file>smileys/thunder.png</file>
+        <file>smileys/moon.png</file>
+        <file>smileys/cloudy.png</file>
+        <file>smileys/lamp.png</file>
+        <file>smileys/good.png</file>
+        <file>smileys/drink.png</file>
+        <file>smileys/airplane.png</file>
+        <file>smileys/turtle.png</file>
+        <file>smileys/time-out.png</file>
         <file>images/connect/connectFriendWatermark.png</file>
         <file>images/connect/connectFriendLogo.png</file>
         <file>images/connect/connectFriendBanner.png</file>
diff --git a/retroshare-gui/src/gui/smileys/airplane.png b/retroshare-gui/src/gui/smileys/airplane.png
new file mode 100644
index 000000000..89b45efe5
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/airplane.png differ
diff --git a/retroshare-gui/src/gui/smileys/drink.png b/retroshare-gui/src/gui/smileys/drink.png
new file mode 100644
index 000000000..46412bece
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/drink.png differ
diff --git a/retroshare-gui/src/gui/smileys/emotes.acs b/retroshare-gui/src/gui/smileys/emotes.acs
index d491a3c63..7eb87cb6b 100644
--- a/retroshare-gui/src/gui/smileys/emotes.acs
+++ b/retroshare-gui/src/gui/smileys/emotes.acs
@@ -17,7 +17,7 @@
 "(P)|(p)":"smileys/camera.png";
 "(C)|(c)":"smileys/coffee.png";
 "*JOKINGLY*|:))|:-))":"smileys/laugh.png";
-"/<B>|/bj|/baijiu":"smileys/liquor.png";
+"bj|baijiu":"smileys/liquor.png";
 "(L)|(l)":"smileys/love.png";
 "(U)|(u)":"smileys/love-over.png";
 "(S)":"smileys/moon.png";
@@ -34,5 +34,14 @@
 "(O)|(o)":"smileys/clock.png";
 "(um)":"smileys/umbrella.png";
 "(6)":"smileys/face-devil-grin48.png";
-
+"(st)":"smileys/rain.png"
+"(li)":"smileys/thunder.png"
+"(S)":"smileys/moon.png"
+"<~>":"smileys/cloudy.png"
+"*-:)":"smileys/lamp.png"
+"(Y)|(y)":"smileys/good.png"
+"(D)|(d)":"smileys/drink.png"
+"(ap)":"smileys/airplane.png"
+"(tu)":"smileys/turtle.png"
+":-t|:-T":"smileys/time-out.png"
 }
diff --git a/retroshare-gui/src/gui/smileys/good.png b/retroshare-gui/src/gui/smileys/good.png
new file mode 100644
index 000000000..127d07313
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/good.png differ
diff --git a/retroshare-gui/src/gui/smileys/lamp.png b/retroshare-gui/src/gui/smileys/lamp.png
new file mode 100644
index 000000000..0431d75bb
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/lamp.png differ
diff --git a/retroshare-gui/src/gui/smileys/time-out.png b/retroshare-gui/src/gui/smileys/time-out.png
new file mode 100644
index 000000000..1090b3077
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/time-out.png differ
diff --git a/retroshare-gui/src/gui/smileys/turtle.png b/retroshare-gui/src/gui/smileys/turtle.png
new file mode 100644
index 000000000..505d5b221
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/turtle.png differ