diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp
index 31dc4ffcc..1e1154f8c 100644
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@@ -173,6 +173,7 @@ PeersDialog::PeersDialog(QWidget *parent)
 
   QMenu * grpchatmenu = new QMenu();
   grpchatmenu->addAction(ui.actionClearChat);
+  grpchatmenu->addAction(ui.actionDisable_Emoticons);
   ui.menuButton->setMenu(grpchatmenu);
 
   _underline = false;
@@ -967,6 +968,8 @@ void PeersDialog::insertChat()
                     count ++;
                 }
 
+                if(!ui.actionDisable_Emoticons->isChecked()) 
+                { 
                 QHashIterator<QString, QString> i(smileys);
                 while(i.hasNext())
                 {
@@ -974,6 +977,7 @@ void PeersDialog::insertChat()
                     foreach(QString code, i.key().split("|"))
                             extraTxt.replace(code, "<img src=\"" + i.value() + "\" />");
                 }
+                }
 
                 if ((msgWidget->verticalScrollBar()->maximum() - 30) < msgWidget->verticalScrollBar()->value() ) {
                 msgWidget->append(extraTxt);
diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui
index c51b48926..134554020 100644
--- a/retroshare-gui/src/gui/PeersDialog.ui
+++ b/retroshare-gui/src/gui/PeersDialog.ui
@@ -1117,6 +1117,10 @@ border: 1px solid #CCCCCC;}</string>
                 <property name="text">
                  <string/>
                 </property>
+                <property name="icon">
+                 <iconset resource="images.qrc">
+                  <normaloff>:/images/fonts.png</normaloff>:/images/fonts.png</iconset>
+                </property>
                 <property name="autoRaise">
                  <bool>true</bool>
                 </property>
@@ -1158,7 +1162,7 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="menuButton">
+               <widget class="QPushButton" name="menuButton">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                   <horstretch>0</horstretch>
@@ -1180,11 +1184,18 @@ p, li { white-space: pre-wrap; }
                 <property name="text">
                  <string/>
                 </property>
-                <property name="popupMode">
-                 <enum>QToolButton::MenuButtonPopup</enum>
+                <property name="icon">
+                 <iconset resource="images.qrc">
+                  <normaloff>:/images/configure.png</normaloff>:/images/configure.png</iconset>
                 </property>
-                <property name="autoRaise">
-                 <bool>false</bool>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
+                </property>
+                <property name="flat">
+                 <bool>true</bool>
                 </property>
                </widget>
               </item>
@@ -1301,6 +1312,10 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
   <action name="actionClearChat">
+   <property name="icon">
+    <iconset resource="images.qrc">
+     <normaloff>:/images/edit-clear-history.png</normaloff>:/images/edit-clear-history.png</iconset>
+   </property>
    <property name="text">
     <string>Clear Chat History</string>
    </property>
@@ -1377,6 +1392,17 @@ p, li { white-space: pre-wrap; }
     <string>Edit your status Message</string>
    </property>
   </action>
+  <action name="actionDisable_Emoticons">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Disable Emoticons</string>
+   </property>
+   <property name="toolTip">
+    <string>Disable Emoticons</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="images.qrc"/>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index b26dfcf1f..e99d705cd 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -11,16 +11,17 @@
         <file>images/btn4.png</file>
         <file>images/btn_26.png</file>
         <file>images/btn_26_hover.png</file>
+        <file>images/btn_26_pressed.png</file>
         <file>images/btn_27.png</file>
         <file>images/btn_27_hover.png</file>
         <file>images/connect_established.png</file>
         <file>images/connect_creating.png</file>
         <file>images/connect_no.png</file>
+        <file>images/edit-clear-history.png</file>
         <file>images/feedback_arrow.png</file>
         <file>images/feedback_arrow_hover.png</file>
         <file>images/list_bullet_arrow.png</file>
         <file>images/rc_combined.png</file>
-        <file>images/btn_26_pressed.png</file>
         <file>images/combobox_arrow.png</file>
         <file>images/arrow-left.png</file>
         <file>images/arrow-right.png</file>
@@ -37,6 +38,7 @@
         <file>images/backgroundl.png</file>
         <file>images/blockdevice.png</file>
         <file>images/blockdevice2.png</file>
+        <file>images/configure.png</file>
         <file>images/channels.png</file>
         <file>images/turtle.png</file>
         <file>images/channels16.png</file>
diff --git a/retroshare-gui/src/gui/images/configure.png b/retroshare-gui/src/gui/images/configure.png
new file mode 100644
index 000000000..45b8fae8b
Binary files /dev/null and b/retroshare-gui/src/gui/images/configure.png differ
diff --git a/retroshare-gui/src/gui/images/edit-clear-history.png b/retroshare-gui/src/gui/images/edit-clear-history.png
new file mode 100644
index 000000000..136dadbe1
Binary files /dev/null and b/retroshare-gui/src/gui/images/edit-clear-history.png differ
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 6d86d136d..f462c03d5 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -53,7 +53,6 @@
 #define IMAGE_FORUMS   	        ":/images/konversation.png"
 #define IMAGE_CHANNELS       	":/images/channels.png"
 #define IMAGE_PREFERENCES       ":/images/settings16.png"
-#define IMAGE_CHAT          	":/images/chats_24x24.png"
 #define IMAGE_RETROSHARE        ":/images/RetroShare16.png"
 #define IMAGE_ABOUT             ":/images/informations_24x24.png"
 #define IMAGE_STATISTIC         ":/images/ksysguard32.png"
@@ -63,7 +62,6 @@
 #define IMAGE_RSM32             ":/images/rsmessenger32.png"
 #define IMAGE_RSM16             ":/images/rsmessenger16.png"
 #define IMAGE_CLOSE             ":/images/close_normal.png"
-#define IMAGE_SMPLAYER          ":/images/smplayer_icon32.png"
 #define IMAGE_CALENDAR          ":/images/calendar.png"
 #define IMAGE_NEWSFEED          ":/images/konqsidebar_news24.png"
 #define IMAGE_LINKS             ":/images/ktorrent.png"