diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 40dc5e146..9d71419aa 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -425,7 +425,6 @@
         <file>smileys/camera.png</file>
         <file>smileys/cat.png</file>
         <file>smileys/clock.png</file>
-        <file>smileys/cloudy.png</file>
         <file>smileys/coffee.png</file>
         <file>smileys/cool.png</file>
         <file>smileys/crying.png</file>
@@ -448,27 +447,33 @@
         <file>smileys/pizza.png</file>
         <file>smileys/pouty.png</file>
         <file>smileys/pumpkin.png</file>
-        <file>smileys/rain.png</file>
         <file>smileys/rotfl.png</file>
         <file>smileys/sad.png</file>
         <file>smileys/smile.png</file>
         <file>smileys/surprised.png</file>
-        <file>smileys/thunder.png</file>
         <file>smileys/tongue.png</file>
         <file>smileys/umbrella.png</file>
         <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>smileys/weather-overcast.png</file>
+        <file>smileys/weather-few-clouds.png</file>
+        <file>smileys/weather-clear.png</file>
+        <file>smileys/weather-clear-night.png</file>
+        <file>smileys/weather-few-clouds-night.png</file>
+        <file>smileys/weather-severe-alert.png</file>
+        <file>smileys/weather-showers.png</file>
+        <file>smileys/weather-showers-scattered.png</file>
+        <file>smileys/weather-snow.png</file>
+        <file>smileys/weather-storm.png</file>
+        <file>smileys/weather-showers.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/emotes.acs b/retroshare-gui/src/gui/smileys/emotes.acs
index 7eb87cb6b..4eae4af3e 100644
--- a/retroshare-gui/src/gui/smileys/emotes.acs
+++ b/retroshare-gui/src/gui/smileys/emotes.acs
@@ -23,7 +23,7 @@
 "(S)":"smileys/moon.png";
 "(mp)":"smileys/mobile.png";
 "(pi)":"smileys/pizza.png";
-":)>-":"smileys/peace.png";
+":)-":"smileys/peace.png";
 "(T)|(t)":"smileys/phone.png";
 "P)":"smileys/pirate.png";
 "(~~)":"smileys/pumpkin.png";
@@ -34,14 +34,21 @@
 "(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"
+"(~)|(wo)":"smileys/weather-overcast.png"
+"(wfc)":"smileys/weather-few-clouds.png"
+"(wc)":"smileys/weather-clear.png"
+"(wcn)":"smileys/weather-clear-night.png"
+"(wfcn)":"smileys/weather-few-clouds-night.png"
+"(wsa)":"smileys/weather-severe-alert.png"
+"(wss)":"smileys/weather-showers-scattered.png"
+"(wsnow)":"smileys/weather-snow.png"
+"(li)":"smileys/weather-storm.png"
+"(st)|(ws)":"smileys/weather-showers.png"
 }
diff --git a/retroshare-gui/src/gui/smileys/weather-clear-night.png b/retroshare-gui/src/gui/smileys/weather-clear-night.png
new file mode 100644
index 000000000..aa2714cbe
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-clear-night.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-clear.png b/retroshare-gui/src/gui/smileys/weather-clear.png
new file mode 100644
index 000000000..c84e8d377
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-clear.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png b/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png
new file mode 100644
index 000000000..62e21d7ff
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-few-clouds-night.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-few-clouds.png b/retroshare-gui/src/gui/smileys/weather-few-clouds.png
new file mode 100644
index 000000000..8c14e0d71
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-few-clouds.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-overcast.png b/retroshare-gui/src/gui/smileys/weather-overcast.png
new file mode 100644
index 000000000..cc22e4ce4
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-overcast.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-severe-alert.png b/retroshare-gui/src/gui/smileys/weather-severe-alert.png
new file mode 100644
index 000000000..fb75808bb
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-severe-alert.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-showers-scattered.png b/retroshare-gui/src/gui/smileys/weather-showers-scattered.png
new file mode 100644
index 000000000..6e85a7bc9
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-showers-scattered.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-showers.png b/retroshare-gui/src/gui/smileys/weather-showers.png
new file mode 100644
index 000000000..00743484e
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-showers.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-snow.png b/retroshare-gui/src/gui/smileys/weather-snow.png
new file mode 100644
index 000000000..fef6e4dde
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-snow.png differ
diff --git a/retroshare-gui/src/gui/smileys/weather-storm.png b/retroshare-gui/src/gui/smileys/weather-storm.png
new file mode 100644
index 000000000..8a7db962b
Binary files /dev/null and b/retroshare-gui/src/gui/smileys/weather-storm.png differ