diff --git a/retroshare-gui/src/emoticons/emotes.acs b/retroshare-gui/src/emoticons/emotes.acs
index 40fab166e..d42ef1b83 100644
--- a/retroshare-gui/src/emoticons/emotes.acs
+++ b/retroshare-gui/src/emoticons/emotes.acs
@@ -23,7 +23,7 @@
 "(S)":"emoticons/moon.png";
 "(mp)":"emoticons/mobile.png";
 "(pi)":"emoticons/pizza.png";
-":)>-":"emoticons/peace.png";
+":)-":"emoticons/peace.png";
 "(T)|(t)":"emoticons/phone.png";
 "P)":"emoticons/pirate.png";
 "(~~)":"emoticons/pumpkin.png";
@@ -34,14 +34,21 @@
 "(O)|(o)":"emoticons/clock.png";
 "(um)":"emoticons/umbrella.png";
 "(6)":"emoticons/face-devil-grin48.png";
-"(st)":"emoticons/rain.png"
-"(li)":"emoticons/thunder.png"
 "(S)":"emoticons/moon.png"
-"<~>":"emoticons/cloudy.png"
 "*-:)":"emoticons/lamp.png"
 "(Y)|(y)":"emoticons/good.png"
 "(D)|(d)":"emoticons/drink.png"
 "(ap)":"emoticons/airplane.png"
 "(tu)":"emoticons/turtle.png"
 ":-t|:-T":"emoticons/time-out.png"
+"(~)|(wo)":"emoticons/weather-overcast.png"
+"(wfc)":"emoticons/weather-few-clouds.png"
+"(wc)":"emoticons/weather-clear.png"
+"(wcn)":"emoticons/weather-clear-night.png"
+"(wfcn)":"emoticons/weather-few-clouds-night.png"
+"(wsa)":"emoticons/weather-severe-alert.png"
+"(wss)":"emoticons/weather-showers-scattered.png"
+"(wsnow)":"emoticons/weather-snow.png"
+"(li)":"emoticons/weather-storm.png"
+"(st)|(ws)":"emoticons/weather-showers.png"
 }
diff --git a/retroshare-gui/src/emoticons/weather-clear-night.png b/retroshare-gui/src/emoticons/weather-clear-night.png
new file mode 100644
index 000000000..aa2714cbe
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-clear-night.png differ
diff --git a/retroshare-gui/src/emoticons/weather-clear.png b/retroshare-gui/src/emoticons/weather-clear.png
new file mode 100644
index 000000000..c84e8d377
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-clear.png differ
diff --git a/retroshare-gui/src/emoticons/weather-few-clouds-night.png b/retroshare-gui/src/emoticons/weather-few-clouds-night.png
new file mode 100644
index 000000000..62e21d7ff
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-few-clouds-night.png differ
diff --git a/retroshare-gui/src/emoticons/weather-few-clouds.png b/retroshare-gui/src/emoticons/weather-few-clouds.png
new file mode 100644
index 000000000..8c14e0d71
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-few-clouds.png differ
diff --git a/retroshare-gui/src/emoticons/weather-overcast.png b/retroshare-gui/src/emoticons/weather-overcast.png
new file mode 100644
index 000000000..cc22e4ce4
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-overcast.png differ
diff --git a/retroshare-gui/src/emoticons/weather-severe-alert.png b/retroshare-gui/src/emoticons/weather-severe-alert.png
new file mode 100644
index 000000000..fb75808bb
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-severe-alert.png differ
diff --git a/retroshare-gui/src/emoticons/weather-showers-scattered.png b/retroshare-gui/src/emoticons/weather-showers-scattered.png
new file mode 100644
index 000000000..6e85a7bc9
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-showers-scattered.png differ
diff --git a/retroshare-gui/src/emoticons/weather-showers.png b/retroshare-gui/src/emoticons/weather-showers.png
new file mode 100644
index 000000000..00743484e
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-showers.png differ
diff --git a/retroshare-gui/src/emoticons/weather-snow.png b/retroshare-gui/src/emoticons/weather-snow.png
new file mode 100644
index 000000000..fef6e4dde
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-snow.png differ
diff --git a/retroshare-gui/src/emoticons/weather-storm.png b/retroshare-gui/src/emoticons/weather-storm.png
new file mode 100644
index 000000000..8a7db962b
Binary files /dev/null and b/retroshare-gui/src/emoticons/weather-storm.png differ