diff --git a/retroshare-gui/src/emoticons/airplane.png b/retroshare-gui/src/emoticons/airplane.png
deleted file mode 100644
index 89b45efe5..000000000
Binary files a/retroshare-gui/src/emoticons/airplane.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/angry.png b/retroshare-gui/src/emoticons/angry.png
deleted file mode 100644
index fc8dd7218..000000000
Binary files a/retroshare-gui/src/emoticons/angry.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/beer.png b/retroshare-gui/src/emoticons/beer.png
deleted file mode 100644
index e955770a3..000000000
Binary files a/retroshare-gui/src/emoticons/beer.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/cake.png b/retroshare-gui/src/emoticons/cake.png
deleted file mode 100644
index 5cf3dd6b0..000000000
Binary files a/retroshare-gui/src/emoticons/cake.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/camera.png b/retroshare-gui/src/emoticons/camera.png
deleted file mode 100644
index 86ae7c186..000000000
Binary files a/retroshare-gui/src/emoticons/camera.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/cat.png b/retroshare-gui/src/emoticons/cat.png
deleted file mode 100644
index 9454c7b4f..000000000
Binary files a/retroshare-gui/src/emoticons/cat.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/clock.png b/retroshare-gui/src/emoticons/clock.png
deleted file mode 100644
index 4de10e06b..000000000
Binary files a/retroshare-gui/src/emoticons/clock.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/cloudy.png b/retroshare-gui/src/emoticons/cloudy.png
deleted file mode 100644
index 4202a0ef2..000000000
Binary files a/retroshare-gui/src/emoticons/cloudy.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/coffee.png b/retroshare-gui/src/emoticons/coffee.png
deleted file mode 100644
index e80fee3bd..000000000
Binary files a/retroshare-gui/src/emoticons/coffee.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/cool.png b/retroshare-gui/src/emoticons/cool.png
deleted file mode 100644
index a4788a820..000000000
Binary files a/retroshare-gui/src/emoticons/cool.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/crying.png b/retroshare-gui/src/emoticons/crying.png
deleted file mode 100644
index c7a3c013d..000000000
Binary files a/retroshare-gui/src/emoticons/crying.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/drink.png b/retroshare-gui/src/emoticons/drink.png
deleted file mode 100644
index 46412bece..000000000
Binary files a/retroshare-gui/src/emoticons/drink.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/emotes.acs b/retroshare-gui/src/emoticons/emotes.acs
deleted file mode 100644
index d42ef1b83..000000000
--- a/retroshare-gui/src/emoticons/emotes.acs
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-":-)|:)":"emoticons/smile.png";
-":-D|:D":"emoticons/lol.png";
-";-)|;)":"emoticons/wink.png";
-":')":"emoticons/crying.png";
-":-O|:O":"emoticons/surprised.png";
-":-S|:S":"emoticons/wondering.png";
-":-(|:(":"emoticons/sad.png";
-":-*|:-{}":"emoticons/kissing.png";
-":-P|:P":"emoticons/tongue.png";
-"$-)|$)":"emoticons/moneyeyes.png";
-":-@":"emoticons/angry.png";
-"8-)":"emoticons/cool.png";
-"=))|:-j|:-J":"emoticons/rotfl.png";
-"(B)|(b)":"emoticons/beer.png";
-"(@)":"emoticons/cat.png";
-"(P)|(p)":"emoticons/camera.png";
-"(C)|(c)":"emoticons/coffee.png";
-"*JOKINGLY*|:))|:-))":"emoticons/laugh.png";
-"bj|baijiu":"emoticons/liquor.png";
-"(L)|(l)":"emoticons/love.png";
-"(U)|(u)":"emoticons/love-over.png";
-"(S)":"emoticons/moon.png";
-"(mp)":"emoticons/mobile.png";
-"(pi)":"emoticons/pizza.png";
-":)-":"emoticons/peace.png";
-"(T)|(t)":"emoticons/phone.png";
-"P)":"emoticons/pirate.png";
-"(~~)":"emoticons/pumpkin.png";
-":X":"emoticons/in-love.png";
-"(ip)":"emoticons/island.png";
-"(^)":"emoticons/cake.png";
-"<:-P|<:-p":"emoticons/party.png";
-"(O)|(o)":"emoticons/clock.png";
-"(um)":"emoticons/umbrella.png";
-"(6)":"emoticons/face-devil-grin48.png";
-"(S)":"emoticons/moon.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/face-devil-grin48.png b/retroshare-gui/src/emoticons/face-devil-grin48.png
deleted file mode 100644
index a3d5d4eef..000000000
Binary files a/retroshare-gui/src/emoticons/face-devil-grin48.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/good.png b/retroshare-gui/src/emoticons/good.png
deleted file mode 100644
index 127d07313..000000000
Binary files a/retroshare-gui/src/emoticons/good.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/in-love.png b/retroshare-gui/src/emoticons/in-love.png
deleted file mode 100644
index d565f94a5..000000000
Binary files a/retroshare-gui/src/emoticons/in-love.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/island.png b/retroshare-gui/src/emoticons/island.png
deleted file mode 100644
index a335e3f3c..000000000
Binary files a/retroshare-gui/src/emoticons/island.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/kissing.png b/retroshare-gui/src/emoticons/kissing.png
deleted file mode 100644
index 3be11a3de..000000000
Binary files a/retroshare-gui/src/emoticons/kissing.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/lamp.png b/retroshare-gui/src/emoticons/lamp.png
deleted file mode 100644
index 0431d75bb..000000000
Binary files a/retroshare-gui/src/emoticons/lamp.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/laugh.png b/retroshare-gui/src/emoticons/laugh.png
deleted file mode 100644
index b9d1e940b..000000000
Binary files a/retroshare-gui/src/emoticons/laugh.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/liquor.png b/retroshare-gui/src/emoticons/liquor.png
deleted file mode 100644
index cd509c9f0..000000000
Binary files a/retroshare-gui/src/emoticons/liquor.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/lol.png b/retroshare-gui/src/emoticons/lol.png
deleted file mode 100644
index 74938a7e5..000000000
Binary files a/retroshare-gui/src/emoticons/lol.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/love-over.png b/retroshare-gui/src/emoticons/love-over.png
deleted file mode 100644
index fc7ad6fc8..000000000
Binary files a/retroshare-gui/src/emoticons/love-over.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/love.png b/retroshare-gui/src/emoticons/love.png
deleted file mode 100644
index 5171deed6..000000000
Binary files a/retroshare-gui/src/emoticons/love.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/mobile.png b/retroshare-gui/src/emoticons/mobile.png
deleted file mode 100644
index 50781531f..000000000
Binary files a/retroshare-gui/src/emoticons/mobile.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/moneyeyes.png b/retroshare-gui/src/emoticons/moneyeyes.png
deleted file mode 100644
index 563532756..000000000
Binary files a/retroshare-gui/src/emoticons/moneyeyes.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/moon.png b/retroshare-gui/src/emoticons/moon.png
deleted file mode 100644
index 42a41b337..000000000
Binary files a/retroshare-gui/src/emoticons/moon.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/party.png b/retroshare-gui/src/emoticons/party.png
deleted file mode 100644
index 573f23e5e..000000000
Binary files a/retroshare-gui/src/emoticons/party.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/peace.png b/retroshare-gui/src/emoticons/peace.png
deleted file mode 100644
index ffeab9d95..000000000
Binary files a/retroshare-gui/src/emoticons/peace.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/phone.png b/retroshare-gui/src/emoticons/phone.png
deleted file mode 100644
index 83b614f58..000000000
Binary files a/retroshare-gui/src/emoticons/phone.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/pirate.png b/retroshare-gui/src/emoticons/pirate.png
deleted file mode 100644
index bb40142e7..000000000
Binary files a/retroshare-gui/src/emoticons/pirate.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/pizza.png b/retroshare-gui/src/emoticons/pizza.png
deleted file mode 100644
index 461f218ce..000000000
Binary files a/retroshare-gui/src/emoticons/pizza.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/pouty.png b/retroshare-gui/src/emoticons/pouty.png
deleted file mode 100644
index dc113eac5..000000000
Binary files a/retroshare-gui/src/emoticons/pouty.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/pumpkin.png b/retroshare-gui/src/emoticons/pumpkin.png
deleted file mode 100644
index 389c2b0c8..000000000
Binary files a/retroshare-gui/src/emoticons/pumpkin.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/rain.png b/retroshare-gui/src/emoticons/rain.png
deleted file mode 100644
index a67718ed9..000000000
Binary files a/retroshare-gui/src/emoticons/rain.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/rotfl.png b/retroshare-gui/src/emoticons/rotfl.png
deleted file mode 100644
index 7c15bc49e..000000000
Binary files a/retroshare-gui/src/emoticons/rotfl.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/sad.png b/retroshare-gui/src/emoticons/sad.png
deleted file mode 100644
index 11bb359f2..000000000
Binary files a/retroshare-gui/src/emoticons/sad.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/smile.png b/retroshare-gui/src/emoticons/smile.png
deleted file mode 100644
index a113e35cf..000000000
Binary files a/retroshare-gui/src/emoticons/smile.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/surprised.png b/retroshare-gui/src/emoticons/surprised.png
deleted file mode 100644
index 19a7b33a9..000000000
Binary files a/retroshare-gui/src/emoticons/surprised.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/thunder.png b/retroshare-gui/src/emoticons/thunder.png
deleted file mode 100644
index 282e74a12..000000000
Binary files a/retroshare-gui/src/emoticons/thunder.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/time-out.png b/retroshare-gui/src/emoticons/time-out.png
deleted file mode 100644
index 1090b3077..000000000
Binary files a/retroshare-gui/src/emoticons/time-out.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/tongue.png b/retroshare-gui/src/emoticons/tongue.png
deleted file mode 100644
index 53c1819fe..000000000
Binary files a/retroshare-gui/src/emoticons/tongue.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/turtle.png b/retroshare-gui/src/emoticons/turtle.png
deleted file mode 100644
index 505d5b221..000000000
Binary files a/retroshare-gui/src/emoticons/turtle.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/umbrella.png b/retroshare-gui/src/emoticons/umbrella.png
deleted file mode 100644
index 68f6615d4..000000000
Binary files a/retroshare-gui/src/emoticons/umbrella.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-clear-night.png b/retroshare-gui/src/emoticons/weather-clear-night.png
deleted file mode 100644
index aa2714cbe..000000000
Binary files a/retroshare-gui/src/emoticons/weather-clear-night.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-clear.png b/retroshare-gui/src/emoticons/weather-clear.png
deleted file mode 100644
index c84e8d377..000000000
Binary files a/retroshare-gui/src/emoticons/weather-clear.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-few-clouds-night.png b/retroshare-gui/src/emoticons/weather-few-clouds-night.png
deleted file mode 100644
index 62e21d7ff..000000000
Binary files a/retroshare-gui/src/emoticons/weather-few-clouds-night.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-few-clouds.png b/retroshare-gui/src/emoticons/weather-few-clouds.png
deleted file mode 100644
index 8c14e0d71..000000000
Binary files a/retroshare-gui/src/emoticons/weather-few-clouds.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-overcast.png b/retroshare-gui/src/emoticons/weather-overcast.png
deleted file mode 100644
index cc22e4ce4..000000000
Binary files a/retroshare-gui/src/emoticons/weather-overcast.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-severe-alert.png b/retroshare-gui/src/emoticons/weather-severe-alert.png
deleted file mode 100644
index fb75808bb..000000000
Binary files a/retroshare-gui/src/emoticons/weather-severe-alert.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-showers-scattered.png b/retroshare-gui/src/emoticons/weather-showers-scattered.png
deleted file mode 100644
index 6e85a7bc9..000000000
Binary files a/retroshare-gui/src/emoticons/weather-showers-scattered.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-showers.png b/retroshare-gui/src/emoticons/weather-showers.png
deleted file mode 100644
index 00743484e..000000000
Binary files a/retroshare-gui/src/emoticons/weather-showers.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-snow.png b/retroshare-gui/src/emoticons/weather-snow.png
deleted file mode 100644
index fef6e4dde..000000000
Binary files a/retroshare-gui/src/emoticons/weather-snow.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/weather-storm.png b/retroshare-gui/src/emoticons/weather-storm.png
deleted file mode 100644
index 8a7db962b..000000000
Binary files a/retroshare-gui/src/emoticons/weather-storm.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/wink.png b/retroshare-gui/src/emoticons/wink.png
deleted file mode 100644
index 41205b572..000000000
Binary files a/retroshare-gui/src/emoticons/wink.png and /dev/null differ
diff --git a/retroshare-gui/src/emoticons/wondering.png b/retroshare-gui/src/emoticons/wondering.png
deleted file mode 100644
index 181c3c776..000000000
Binary files a/retroshare-gui/src/emoticons/wondering.png and /dev/null differ