diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index b139d0113..46d5116e8 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -197,7 +197,7 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	                      <p>Chat rooms work pretty much like IRC.                                      \
 	                      They allow you to talk anonymously with tons of people without the need to make friends.</p>                    \
 	                      <p>A chat room can be public (your friends see it) or private (your friends can't see it, unless you           \
-                          invite them with <img src=\":/images/add_24x24.png\" width=%2/>). \
+                          invite them with <img src=\":/icons/png/add.png\" width=%2/>). \
 	                      Once you have been invited to a private room, you will be able to see it when your friends   \
 	                      are using it.</p>                                                                                               \
 	                      <p>The list at left shows                                                                                     \
diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.h b/retroshare-gui/src/gui/Circles/CirclesDialog.h
index 4d39986ac..ac87f9f61 100644
--- a/retroshare-gui/src/gui/Circles/CirclesDialog.h
+++ b/retroshare-gui/src/gui/Circles/CirclesDialog.h
@@ -27,7 +27,7 @@
 #include "util/TokenQueue.h"
 #include "ui_CirclesDialog.h"
 
-#define IMAGE_CIRCLES           ":/images/circles/circles_32.png"
+#define IMAGE_CIRCLES           ":/icons/png/circles.png"
 
 class UIStateHelper;
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index eba42e4ff..55887b14a 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -48,11 +48,11 @@
 #define IMAGE_REMOVEALL            ":/images/deleteall.png"
 #define IMAGE_DIRECTORY            ":/images/folder16.png"
 #define IMAGE_OPENFOLDER           ":/images/folderopen.png"
-#define IMAGE_LIBRARY              ":/images/library.png"
-#define IMAGE_COLLCREATE           ":/images/library_add.png"
-#define IMAGE_COLLMODIF            ":/images/library_edit.png"
-#define IMAGE_COLLVIEW             ":/images/library_view.png"
-#define IMAGE_COLLOPEN             ":/images/library.png"
+#define IMAGE_LIBRARY              ":/icons/collections.png"
+#define IMAGE_COLLCREATE           ":/iconss/png/add.png"
+#define IMAGE_COLLMODIF            ":/icons/png/pencil-edit-button.png"
+#define IMAGE_COLLVIEW             ":/images/find.png"
+#define IMAGE_COLLOPEN             ":/icons/collections.png"
 #define IMAGE_COPYLINK             ":/images/copyrslink.png"
 #define IMAGE_BANFILE              ":/icons/biohazard_red.png"
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index a1a2f23a9..af5323d1d 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -60,19 +60,18 @@
 #define IMAGE_HASH_BUSY      ":/images/settings.png"
 #define IMAGE_HASH_DONE      ":/images/accepted16.png"
 #define IMAGE_MSG            ":/images/message-mail.png"
-#define IMAGE_ATTACHMENT     ":/images/attachment.png"
+#define IMAGE_ATTACHMENT     ":/icons/png/attachements.png"
 #define IMAGE_FRIEND         ":/images/peers_16x16.png"
-#define IMAGE_PROGRESS       ":/images/browse-looking.gif"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_OPENFOLDER     ":/images/folderopen.png"
 #define IMAGE_OPENFILE       ":/images/fileopen.png"
-#define IMAGE_LIBRARY        ":/images/library.png"
-#define IMAGE_CHANNEL        ":/images/channels32.png"
+#define IMAGE_LIBRARY        ":/icons/collections.png"
+#define IMAGE_CHANNEL        ":/icons/png/channels.png"
 #define IMAGE_FORUMS         ":/icons/png/forums.png"
-#define IMAGE_COLLCREATE     ":/images/library_add.png"
-#define IMAGE_COLLMODIF      ":/images/library_edit.png"
-#define IMAGE_COLLVIEW       ":/images/library_view.png"
-#define IMAGE_COLLOPEN       ":/images/library.png"
+#define IMAGE_COLLCREATE     ":/icons/png/add.png"
+#define IMAGE_COLLMODIF      ":/icons/png/pencil-edit-button.png"
+#define IMAGE_COLLVIEW       ":/images/find.png"
+#define IMAGE_COLLOPEN       ":/icons/collections.png"
 #define IMAGE_EDITSHARE      ":/images/edit_16.png"
 #define IMAGE_MYFILES        ":/icons/svg/folders1.svg"
 #define IMAGE_REMOVE         ":/images/deletemail24.png"
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 22486fd2c..9a901b809 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -81,11 +81,11 @@
 #define IMAGE_SEARCH               ":/icons/svg/magnifying-glass.svg"
 #define IMAGE_EXPAND               ":/images/edit_add24.png"
 #define IMAGE_COLLAPSE             ":/images/edit_remove24.png"
-#define IMAGE_LIBRARY              ":/images/library.png"
-#define IMAGE_COLLCREATE           ":/images/library_add.png"
-#define IMAGE_COLLMODIF            ":/images/library_edit.png"
-#define IMAGE_COLLVIEW             ":/images/library_view.png"
-#define IMAGE_COLLOPEN             ":/images/library.png"
+#define IMAGE_LIBRARY              ":/icons/collections.png"
+#define IMAGE_COLLCREATE           ":/iconss/png/add.png"
+#define IMAGE_COLLMODIF            ":/icons/png/pencil-edit-button.png"
+#define IMAGE_COLLVIEW             ":/images/find.png"
+#define IMAGE_COLLOPEN             ":/icons/collections.png"
 #define IMAGE_FRIENDSFILES         ":/icons/svg/folders.svg"
 #define IMAGE_MYFILES              ":icons/svg/folders1.svg"
 #define IMAGE_RENAMEFILE           ":images/filecomments.png"
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
index 21f642399..9c03e830c 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
@@ -32,7 +32,7 @@
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
 
-#define IMAGE_TRANSFERS      	":/icons/ktorrent_128.png"
+#define IMAGE_TRANSFERS      	":/icons/png/fileshare.png"
 
 class QShortcut;
 class DLListDelegate;
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 4a4ec6530..2379474d8 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -1162,7 +1162,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
     static const int CANCEL = 3 ; // Admin list: no          Subscription request:  yes
 
     const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ;
-    const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/images/door_in.png",":/images/cancel.png" } ;
+    const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ;
 
     std::vector< std::vector<RsGxsId> > ids(4) ;
 
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
index 92baf07e1..22ed6ebd9 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
@@ -17,8 +17,8 @@
    </sizepolicy>
   </property>
   <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/identity/identities_32.png</normaloff>:/images/identity/identities_32.png</iconset>
+   <iconset resource="../icons.qrc">
+    <normaloff>:/icons/png/person.png</normaloff>:/icons/png/person.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="IdEditDialogVLayout">
    <property name="spacing">
@@ -167,13 +167,13 @@
              <string>Linked to your profile</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/contact22.png</normaloff>:/images/contact22.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/profile.png</normaloff>:/icons/png/profile.png</iconset>
             </property>
             <property name="iconSize">
              <size>
-              <width>22</width>
-              <height>22</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
            </widget>
@@ -190,13 +190,13 @@
              <string>Pseudonym</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/tags/anon.png</normaloff>:/images/tags/anon.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/anonymous.png</normaloff>:/icons/png/anonymous.png</iconset>
             </property>
             <property name="iconSize">
              <size>
-              <width>22</width>
-              <height>22</height>
+              <width>24</width>
+              <height>24</height>
              </size>
             </property>
            </widget>
@@ -528,6 +528,7 @@
  </tabstops>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 3e2bb53dd..cb4a0fed6 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -141,7 +141,6 @@
 
 #define IMAGE_BWGRAPH           ":/icons/png/bandwidth.png"
 #define IMAGE_MESSENGER         ":/images/rsmessenger48.png"
-#define IMAGE_BLOCK         	":/images/blockdevice.png"
 #define IMAGE_COLOR         	":/images/highlight.png"
 #define IMAGE_GAMES             ":/images/kgames.png"
 #define IMAGE_PHOTO             ":/images/lphoto.png"
@@ -153,7 +152,6 @@
 #define IMAGE_MAXIMIZE          ":/images/window_fullscreen.png"
 
 #define IMAGE_PLUGINS           ":/images/extension_32.png"
-#define IMAGE_BLOGS             ":/images/kblogger.png"
 
 /*static*/ bool MainWindow::hiddenmode = false;
 
diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index ff41dd658..dd29dec14 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -47,12 +47,10 @@
 #include <time.h>
 
 /* Images for context menu icons */
-#define IMAGE_LOADCERT       ":/images/loadcert16.png"
 #define IMAGE_PEERDETAILS    ":/images/info16.png"
-#define IMAGE_AUTH           ":/images/encrypted16.png"
 #define IMAGE_CLEAN_UNUSED   ":/images/deletemail24.png"
 #define IMAGE_MAKEFRIEND     ":/images/user/add_user16.png"
-#define IMAGE_EXPORT         ":/images/exportpeers_16x16.png"
+#define IMAGE_EXPORT         ""
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_MESSAGE         ":/images/mail_new.png"
 
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
index 73a57eb6a..bd44c4d0a 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
@@ -176,8 +176,8 @@
                      </property>
                      <property name="iconSize">
                       <size>
-                       <width>24</width>
-                       <height>24</height>
+                       <width>32</width>
+                       <height>32</height>
                       </size>
                      </property>
                     </widget>
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 974195746..7fadce49a 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -100,9 +100,9 @@ static bool isNewerThanEpoque(uint32_t ts)
 
 void RetroshareDirModel::treeStyle()
 {
-	categoryIcon.addPixmap(QPixmap(":/images/folder16.png"),
+	categoryIcon.addPixmap(QPixmap(":/icons/folder.png"),
 	                     QIcon::Normal, QIcon::Off);
-	categoryIcon.addPixmap(QPixmap(":/images/folder_video.png"),
+	categoryIcon.addPixmap(QPixmap(":/icons/folderopen.png"),
 	                     QIcon::Normal, QIcon::On);
 	peerIcon = QIcon(":/images/user/identity16.png");
 }
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui
index 6cfa8774a..3f6074b37 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui
@@ -315,7 +315,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../LinksCloud/images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
index 7642f3827..ad15fb905 100644
--- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
@@ -28,7 +28,7 @@
 #include "gui/common/StatusDefs.h"
 #include "rshare.h"
 
-#define IMAGE_TYPING         ":/images/typing.png"
+#define IMAGE_TYPING         ":/icons/png/typing.png"
 #define IMAGE_CHAT           ":/images/chat.png"
 
 ChatTabWidget::ChatTabWidget(QWidget *parent) :
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 0922793f6..e8122ad6a 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1860,7 +1860,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const
 void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent)
 {
 	ui->typingLabel->setText(QString(statusMask).arg(trUtf8(statusString.toUtf8()))); // displays info for 5 secs.
-	ui->typingPixmapLabel->setPixmap(QPixmap(":images/typing.png") );
+	ui->typingPixmapLabel->setPixmap(QPixmap(":icons/png/typing.png") );
 
 	if (statusString == "is typing...") {
 		typing = true;
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index c6a9f9c0b..4cd9ce049 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -45,8 +45,8 @@ AvatarDialog::AvatarDialog(QWidget *parent) :
 	updateInterface();
 }
 
-const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W = 64;
-const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_H = 64;
+const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W = 96;
+const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_H = 96;
 
 AvatarDialog::~AvatarDialog()
 {
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 190fcccc5..6012bd832 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -142,7 +142,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
 	
 	
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png"));
 
 	if(creation)
 	{
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 8b72f68e5..ceaea3b99 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -308,8 +308,8 @@
                       <string/>
                      </property>
                      <property name="icon">
-                      <iconset resource="../../../../plugins/FeedReader/gui/FeedReader_images.qrc">
-                       <normaloff>:/images/Update.png</normaloff>:/images/Update.png</iconset>
+                      <iconset resource="../images.qrc">
+                       <normaloff>:/images/update.png</normaloff>:/images/update.png</iconset>
                      </property>
                     </widget>
                    </item>
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index cbab657c4..6111dfb45 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -13,8 +13,8 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
     <widget class="HeaderFrame" name="headerFrame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -24,7 +24,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -33,18 +33,11 @@
       <attribute name="title">
        <string>Profile info</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_name">
-             <property name="text">
-              <string>Name :</string>
-             </property>
-            </widget>
-           </item>
            <item row="0" column="1">
             <widget class="QLineEdit" name="name">
              <property name="readOnly">
@@ -52,13 +45,6 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="pgpfingerprint_label">
-             <property name="text">
-              <string>Fingerprint :</string>
-             </property>
-            </widget>
-           </item>
            <item row="1" column="1">
             <widget class="QLineEdit" name="pgpfingerprint">
              <property name="toolTip">
@@ -69,13 +55,17 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="web_of_trust_label">
+           <item row="1" column="0">
+            <widget class="QLabel" name="pgpfingerprint_label">
              <property name="text">
-              <string>Trust level:</string>
+              <string>Fingerprint :</string>
              </property>
-             <property name="wordWrap">
-              <bool>true</bool>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_name">
+             <property name="text">
+              <string>Name :</string>
              </property>
             </widget>
            </item>
@@ -140,11 +130,65 @@
              </item>
             </widget>
            </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="web_of_trust_label">
+             <property name="text">
+              <string>Trust level:</string>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string>Keysigning:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <widget class="QToolButton" name="signKeyButton">
+               <property name="toolTip">
+                <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>Sign this key</string>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>48</width>
+                 <height>48</height>
+                </size>
+               </property>
+               <property name="toolButtonStyle">
+                <enum>Qt::ToolButtonTextUnderIcon</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="signGPGKeyCheckBox">
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>Sign PGP key</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
           </layout>
          </item>
         </layout>
        </item>
-       <item>
+       <item row="1" column="0">
         <widget class="QLabel" name="is_signing_me">
          <property name="font">
           <font>
@@ -157,7 +201,7 @@
          </property>
         </widget>
        </item>
-       <item>
+       <item row="2" column="0">
         <widget class="QGroupBox" name="signersBox">
          <property name="title">
           <string>Key signatures :</string>
@@ -173,7 +217,7 @@
          </layout>
         </widget>
        </item>
-       <item>
+       <item row="3" column="0">
         <layout class="QHBoxLayout" name="friendAndSignLayout">
          <property name="leftMargin">
           <number>6</number>
@@ -187,43 +231,6 @@
          <property name="bottomMargin">
           <number>6</number>
          </property>
-         <item>
-          <widget class="QToolButton" name="signKeyButton">
-           <property name="toolTip">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Sign this key</string>
-           </property>
-           <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/view-certificate-sign-48.png</normaloff>:/images/view-certificate-sign-48.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>48</width>
-             <height>48</height>
-            </size>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextUnderIcon</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="signGPGKeyCheckBox">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Sign PGP key</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@@ -451,7 +458,7 @@ p, li { white-space: pre-wrap; }
      </widget>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -462,9 +469,6 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
   </layout>
-  <zorder>stabWidget</zorder>
-  <zorder>headerFrame</zorder>
-  <zorder>buttonBox</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp
index edc60012a..a11b7b788 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp
@@ -76,14 +76,14 @@ void GroupShareKey::setTyp()
         if (!rsGxsChannels)
             return;
             
-        ui->headerFrame->setHeaderImage(QPixmap(":/images/channels.png"));
+        ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/channels.png"));
         ui->headerFrame->setHeaderText(tr("Share channel publish permissions"));
         ui->sharekeyinfo_label->setText(tr("You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions."));
     }
     else if(mGrpType == FORUM_KEY_SHARE)
     {
         
-        ui->headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png"));
+        ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png"));
         ui->headerFrame->setHeaderText(tr("Share forum admin permissions"));
         ui->sharekeyinfo_label->setText(tr("You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum."));
 
diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
index a7627a967..aa2210bee 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
@@ -36,9 +36,9 @@
 
 /* Images for tag icons */
 #define IMAGE_LOADING     ":/images/folder-draft.png"
-#define IMAGE_PGPKNOWN    ":/images/contact.png"
+#define IMAGE_PGPKNOWN    ":/icons/png/profile.png"
 #define IMAGE_PGPUNKNOWN  ":/images/tags/pgp-unknown.png"
-#define IMAGE_ANON        ":/images/tags/anon.png"
+#define IMAGE_ANON        ":/icons/png/anonymous.png"
 #define IMAGE_BANNED      ":/icons/biohazard_red.png"
 
 #define IMAGE_DEV_AMBASSADOR     ":/images/tags/dev-ambassador.png"
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
index 5086f4acb..703f43bb1 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
@@ -285,48 +285,6 @@ p, li { white-space: pre-wrap; }
            <number>0</number>
           </property>
           <item row="0" column="0">
-           <widget class="QLabel" name="attachmentsPixLabel">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="../images.qrc">:/images/attachment.png</pixmap>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="attachmentsLabel">
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>26</height>
-             </size>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Attachments</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <spacer name="attachmentsHSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>334</width>
-              <height>26</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="3">
            <widget class="QPushButton" name="addFileButton">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -340,6 +298,9 @@ p, li { white-space: pre-wrap; }
               <height>34</height>
              </size>
             </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
              <string/>
             </property>
@@ -355,16 +316,6 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item row="0" column="4">
-           <widget class="QCheckBox" name="thumbNailCb">
-            <property name="toolTip">
-             <string>Allow channels to get frame for message thumbnail from movie media attachments or not</string>
-            </property>
-            <property name="text">
-             <string>Auto Thumbnail</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="0" colspan="5">
            <widget class="QScrollArea" name="attachmentsScrollArea">
             <property name="verticalScrollBarPolicy">
@@ -378,7 +329,7 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>81</width>
+               <width>632</width>
                <height>24</height>
               </rect>
              </property>
@@ -425,6 +376,29 @@ p, li { white-space: pre-wrap; }
             </widget>
            </widget>
           </item>
+          <item row="0" column="2">
+           <spacer name="attachmentsHSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>334</width>
+              <height>26</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="thumbNailCb">
+            <property name="toolTip">
+             <string>Allow channels to get frame for message thumbnail from movie media attachments or not</string>
+            </property>
+            <property name="text">
+             <string>Auto Thumbnail</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </widget>
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index 6588d85c2..e449e685d 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -175,7 +175,7 @@ QString GxsChannelDialog::icon(IconType type)
     case ICON_SEARCH:
         return ":/images/find.png";
 	case ICON_DEFAULT:
-		return ":/images/channels.png";
+		return ":/icons/png/channels.png";
 	}
 
 	return "";
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
index 3286c5f8b..7443ee04c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
@@ -39,7 +39,7 @@
 
 #include <algorithm>
 
-#define CHAN_DEFAULT_IMAGE ":/images/channels.png"
+#define CHAN_DEFAULT_IMAGE ":/icons/png/channels.png"
 
 #define ROLE_PUBLISH FEED_TREEWIDGET_SORTROLE
 
diff --git a/retroshare-gui/src/gui/help/content/de/peerdetails.html b/retroshare-gui/src/gui/help/content/de/peerdetails.html
index f008600c1..b1b0d3db7 100644
--- a/retroshare-gui/src/gui/help/content/de/peerdetails.html
+++ b/retroshare-gui/src/gui/help/content/de/peerdetails.html
@@ -33,7 +33,7 @@ Peer Details Trust settings and Signing
 
 <a name="trust"/>
 <h3>Trust Settings</h3>
-    <td><img src="qrc:/images/trustsettings.png"/></td>
+
 <p>
 The trust settings refers to the gnupg web of trust mecanism. <br>
 This trust means how you trust your friends when he is signing other PGP keys. <br>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 218ecc211..f57a8726f 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -35,14 +35,11 @@
         <file>icons/bullet_grey_128.png</file>
         <file>icons/bullet_red_128.png</file>
         <file>icons/bullet_yellow_128.png</file>
-        <file>icons/channels_128.png</file>
-        <file>icons/channels_red_128.png</file>
-        <file>icons/chat_128.png</file>
-        <file>icons/chat_red_128.png</file>
-        <file>icons/circles_128.png</file>
-        <file>icons/circles_new_128.png</file>
+        <file>icons/collections.png</file>
         <file>icons/flag-green.png</file>
         <file>icons/friends_128.png</file>
+        <file>icons/folder.png</file>
+        <file>icons/folderopen.png</file>
         <file>icons/global_switch_off_128.png</file>
         <file>icons/global_switch_on_128.png</file>
         <file>icons/gmail.png</file>
@@ -51,25 +48,15 @@
         <file>icons/information_128.png</file>
         <file>icons/internet_128.png</file>
         <file>icons/invite64.png</file>
-        <file>icons/knews_128.png</file>
-        <file>icons/knews_red_128.png</file>
-        <file>icons/konversation_128.png</file>
-        <file>icons/konversation128.png</file>
-        <file>icons/konversation_red_128.png</file>
-        <file>icons/ktorrent_128.png</file>
-        <file>icons/ktorrent_red_128.png</file>
         <file>icons/logo_0_connected_128.png</file>
         <file>icons/logo_128.png</file>
         <file>icons/logo_1_connected_128.png</file>
         <file>icons/logo_2_connected_128.png</file>
-        <file>icons/mail_128.png</file>
-        <file>icons/mail_old_128.png</file>
-        <file>icons/mail_red_128.png</file>
-        <file>icons/newsfeed128.png</file>
         <file>icons/outlook.png</file>
         <file>icons/question.png</file>
         <file>icons/plugins_128.png</file>
         <file>icons/png/add.png</file>
+        <file>icons/png/anonymous.png</file>
         <file>icons/png/attach-image.png</file>
         <file>icons/png/attach.png</file>
         <file>icons/png/cert.png</file>
@@ -124,6 +111,7 @@
         <file>icons/png/phone.png</file>
         <file>icons/png/posted-notify.png</file>
         <file>icons/png/posted.png</file>
+        <file>icons/png/profile.png</file>
         <file>icons/png/search.png</file>
         <file>icons/png/send-message-blocked.png</file>
         <file>icons/png/send-message.png</file>
@@ -136,8 +124,6 @@
         <file>icons/png/thumbs-up.png</file>
 		<file>icons/png/typing.png</file>
         <file>icons/png/video.png</file>
-        <file>icons/posted_128.png</file>
-        <file>icons/posted_red_128.png</file>
         <file>icons/quit_128.png</file>
         <file>icons/search_red_128.png</file>
         <file>icons/security_high_128.png</file>
diff --git a/retroshare-gui/src/gui/icons/channels_128.png b/retroshare-gui/src/gui/icons/channels_128.png
deleted file mode 100644
index ed21268c2..000000000
Binary files a/retroshare-gui/src/gui/icons/channels_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/channels_red_128.png b/retroshare-gui/src/gui/icons/channels_red_128.png
deleted file mode 100644
index 6d384db9d..000000000
Binary files a/retroshare-gui/src/gui/icons/channels_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/chat_128.png b/retroshare-gui/src/gui/icons/chat_128.png
deleted file mode 100644
index 7212a977d..000000000
Binary files a/retroshare-gui/src/gui/icons/chat_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/chat_red_128.png b/retroshare-gui/src/gui/icons/chat_red_128.png
deleted file mode 100644
index 47860491e..000000000
Binary files a/retroshare-gui/src/gui/icons/chat_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/circles_128.png b/retroshare-gui/src/gui/icons/circles_128.png
deleted file mode 100644
index d2664a82c..000000000
Binary files a/retroshare-gui/src/gui/icons/circles_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/circles_new_128.png b/retroshare-gui/src/gui/icons/circles_new_128.png
deleted file mode 100644
index 7c2c1099c..000000000
Binary files a/retroshare-gui/src/gui/icons/circles_new_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/collections.png b/retroshare-gui/src/gui/icons/collections.png
new file mode 100644
index 000000000..cb02eb5d3
Binary files /dev/null and b/retroshare-gui/src/gui/icons/collections.png differ
diff --git a/retroshare-gui/src/gui/icons/folder.png b/retroshare-gui/src/gui/icons/folder.png
new file mode 100644
index 000000000..01f942628
Binary files /dev/null and b/retroshare-gui/src/gui/icons/folder.png differ
diff --git a/retroshare-gui/src/gui/icons/folderopen.png b/retroshare-gui/src/gui/icons/folderopen.png
new file mode 100644
index 000000000..544e5f0b7
Binary files /dev/null and b/retroshare-gui/src/gui/icons/folderopen.png differ
diff --git a/retroshare-gui/src/gui/icons/knews_128.png b/retroshare-gui/src/gui/icons/knews_128.png
deleted file mode 100644
index 97fd4eb6f..000000000
Binary files a/retroshare-gui/src/gui/icons/knews_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/knews_red_128.png b/retroshare-gui/src/gui/icons/knews_red_128.png
deleted file mode 100644
index 82cde6d33..000000000
Binary files a/retroshare-gui/src/gui/icons/knews_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/konversation128.png b/retroshare-gui/src/gui/icons/konversation128.png
deleted file mode 100644
index 4398fd869..000000000
Binary files a/retroshare-gui/src/gui/icons/konversation128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/konversation_128.png b/retroshare-gui/src/gui/icons/konversation_128.png
deleted file mode 100644
index 4398fd869..000000000
Binary files a/retroshare-gui/src/gui/icons/konversation_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/konversation_red_128.png b/retroshare-gui/src/gui/icons/konversation_red_128.png
deleted file mode 100644
index 1f248cbb8..000000000
Binary files a/retroshare-gui/src/gui/icons/konversation_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/ktorrent_128.png b/retroshare-gui/src/gui/icons/ktorrent_128.png
deleted file mode 100644
index 764568d35..000000000
Binary files a/retroshare-gui/src/gui/icons/ktorrent_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/ktorrent_red_128.png b/retroshare-gui/src/gui/icons/ktorrent_red_128.png
deleted file mode 100644
index 92a45bf54..000000000
Binary files a/retroshare-gui/src/gui/icons/ktorrent_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/mail_128.png b/retroshare-gui/src/gui/icons/mail_128.png
deleted file mode 100644
index 1fe0adacf..000000000
Binary files a/retroshare-gui/src/gui/icons/mail_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/mail_old_128.png b/retroshare-gui/src/gui/icons/mail_old_128.png
deleted file mode 100644
index 217e18128..000000000
Binary files a/retroshare-gui/src/gui/icons/mail_old_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/mail_red_128.png b/retroshare-gui/src/gui/icons/mail_red_128.png
deleted file mode 100644
index 115542019..000000000
Binary files a/retroshare-gui/src/gui/icons/mail_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/newsfeed128.png b/retroshare-gui/src/gui/icons/newsfeed128.png
deleted file mode 100644
index 19c256c9f..000000000
Binary files a/retroshare-gui/src/gui/icons/newsfeed128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/png/anonymous.png b/retroshare-gui/src/gui/icons/png/anonymous.png
new file mode 100644
index 000000000..06d37d941
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/anonymous.png differ
diff --git a/retroshare-gui/src/gui/icons/png/attachements.png b/retroshare-gui/src/gui/icons/png/attachements.png
index 1d0941a5d..5fcfd0ae3 100644
Binary files a/retroshare-gui/src/gui/icons/png/attachements.png and b/retroshare-gui/src/gui/icons/png/attachements.png differ
diff --git a/retroshare-gui/src/gui/icons/png/message.png b/retroshare-gui/src/gui/icons/png/message.png
index ae9da7e01..da8a3b312 100644
Binary files a/retroshare-gui/src/gui/icons/png/message.png and b/retroshare-gui/src/gui/icons/png/message.png differ
diff --git a/retroshare-gui/src/gui/icons/png/profile.png b/retroshare-gui/src/gui/icons/png/profile.png
new file mode 100644
index 000000000..833cbbee7
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/profile.png differ
diff --git a/retroshare-gui/src/gui/icons/posted_128.png b/retroshare-gui/src/gui/icons/posted_128.png
deleted file mode 100644
index 94c5a50a5..000000000
Binary files a/retroshare-gui/src/gui/icons/posted_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/posted_red_128.png b/retroshare-gui/src/gui/icons/posted_red_128.png
deleted file mode 100644
index 70125b257..000000000
Binary files a/retroshare-gui/src/gui/icons/posted_red_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/icons/svg/anonymous.svg b/retroshare-gui/src/gui/icons/svg/anonymous.svg
new file mode 100644
index 000000000..ba7dc60a3
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/anonymous.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve" width="512px" height="512px" class=""><g transform="matrix(0.95099 0 0 0.95099 12.5465 12.5465)"><g>
+	<g>
+		<path d="M418.88,344.021l-54.869-19.093c-4.011-1.365-8.469-0.277-11.371,2.859c-26.901,29.376-61.227,45.547-96.64,45.547    s-69.739-16.171-96.64-45.525c-2.88-3.136-7.36-4.224-11.371-2.859L93.12,344.043C37.419,363.392,0,416.021,0,475.008v15.659    c0,5.888,4.779,10.667,10.667,10.667h490.667c5.888,0,10.667-4.779,10.667-10.667v-15.659    C512,416.021,474.581,363.392,418.88,344.021z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M224,181.333h-21.333c-5.888,0-10.667,4.779-10.667,10.667s4.779,10.667,10.667,10.667H224    c5.888,0,10.667-4.779,10.667-10.667S229.888,181.333,224,181.333z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M309.333,181.333H288c-5.888,0-10.667,4.779-10.667,10.667s4.779,10.667,10.667,10.667h21.333    c5.888,0,10.667-4.779,10.667-10.667S315.221,181.333,309.333,181.333z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M369.643,222.229c-5.76-1.429-11.499,2.048-12.928,7.787C341.781,290.219,301.312,330.667,256,330.667    s-85.781-40.448-100.715-100.651c-1.429-5.739-7.232-9.216-12.928-7.787c-5.717,1.408-9.195,7.211-7.787,12.928    C151.915,305.045,200.704,352,256,352s104.085-46.955,121.429-116.843C378.837,229.44,375.36,223.637,369.643,222.229z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M256,10.667c-70.507,0-125.739,56.235-125.739,128c0,5.888,4.779,10.667,10.667,10.667s10.667-4.779,10.667-10.667    C151.595,78.848,197.44,32,256,32s104.405,46.848,104.405,106.667c0,5.888,4.779,10.667,10.667,10.667s10.667-4.779,10.667-10.667    C381.739,66.901,326.507,10.667,256,10.667z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M336.576,236.437c-4.949-3.264-11.52-1.941-14.784,2.965l-14.997,22.507c-1.984,2.987-5.312,4.757-8.875,4.757h-3.925    c-4.907,0-9.152-3.328-10.859-9.6l-6.635-15.851c-1.664-3.968-5.525-6.549-9.835-6.549h-21.333c-4.309,0-8.171,2.581-9.856,6.571    l-7.125,17.365c-1.195,4.757-5.44,8.085-10.347,8.085h-3.925c-3.563,0-6.891-1.771-8.875-4.757l-14.997-22.507    c-3.264-4.928-9.877-6.229-14.784-2.965c-4.907,3.264-6.229,9.877-2.965,14.784l14.997,22.507    C193.408,282.667,203.371,288,214.08,288h3.925c14.72,0,27.477-9.963,30.549-22.699l3.883-9.301h7.189l3.328,7.765    c3.563,14.272,16.341,24.235,31.04,24.235h3.925c10.709,0,20.672-5.333,26.624-14.272l14.997-22.507    C342.805,246.315,341.483,239.701,336.576,236.437z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M222.784,229.717c-2.752-5.205-9.152-7.253-14.4-4.501c-7.573,3.968-32.299,9.451-59.051,9.451    c-5.888,0-10.667,4.779-10.667,10.667S143.445,256,149.333,256c30.037,0,57.941-6.123,68.949-11.883    C223.509,241.387,225.515,234.944,222.784,229.717z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M362.667,234.667c-26.752,0-51.477-5.483-59.051-9.451c-5.227-2.752-11.669-0.704-14.4,4.501    c-2.731,5.227-0.725,11.669,4.501,14.4c11.008,5.76,38.912,11.883,68.949,11.883c5.888,0,10.667-4.779,10.667-10.667    S368.555,234.667,362.667,234.667z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M241.643,151.915c-8.896-7.68-54.485-44.821-78.507-20.8c-4.16,4.16-4.16,10.923,0,15.083c4.16,4.16,10.923,4.16,15.083,0    c6.933-6.891,33.493,8.085,49.493,21.867c2.027,1.749,4.48,2.603,6.955,2.603c2.987,0,5.973-1.259,8.085-3.712    C246.592,162.496,246.101,155.776,241.643,151.915z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M348.864,131.136c-24-23.979-69.611,13.12-78.507,20.8c-4.459,3.861-4.949,10.581-1.109,15.04    c2.112,2.432,5.077,3.691,8.085,3.691c2.475,0,4.949-0.853,6.955-2.581c16.021-13.803,42.624-28.736,49.493-21.867    c4.16,4.16,10.923,4.16,15.083,0C353.024,142.059,353.024,135.296,348.864,131.136z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M377.877,75.669C332.288,54.272,259.2,53.355,255.915,53.333c-3.093,0.021-76.181,0.939-121.771,22.336    c-3.904,1.835-6.315,5.824-6.144,10.112l6.272,147.243c0.256,5.909,5.397,10.603,11.115,10.219    c5.888-0.256,10.453-5.227,10.197-11.115l-5.952-139.925c41.835-16.725,105.792-17.536,106.261-17.536    c0.683,0,64.619,0.811,106.475,17.536l-5.952,139.925c-0.256,5.888,4.309,10.859,10.197,11.115c0.149,0,0.32,0,0.469,0    c5.675,0,10.411-4.48,10.667-10.219L384,85.781C384.171,81.493,381.76,77.504,377.877,75.669z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M268.416,288.128c-5.824-1.045-11.307,2.965-12.267,8.768L256,297.771l-0.149-0.853c-0.96-5.803-6.485-9.813-12.267-8.768    c-5.803,0.96-9.728,6.464-8.768,12.267l10.667,64c0.853,5.141,5.291,8.917,10.517,8.917s9.664-3.776,10.517-8.939l10.667-64    C278.165,294.592,274.219,289.088,268.416,288.128z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g><g>
+	<g>
+		<path d="M363.989,72.853C341.269,33.92,300.885,10.667,256,10.667S170.731,33.92,148.011,72.853    c-2.24,3.797-1.877,8.597,0.875,12.032c2.752,3.456,7.36,4.864,11.541,3.52c41.323-13.056,95.125-13.739,95.467-13.739    c0.533,0,54.272,0.661,95.68,13.739c1.045,0.341,2.133,0.491,3.2,0.491c3.179,0,6.272-1.429,8.341-4.011    C365.867,81.451,366.229,76.651,363.989,72.853z" data-original="#000000" class="active-path" data-old_color="#000000" fill="#039BD5"/>
+	</g>
+</g></g> </svg>
diff --git a/retroshare-gui/src/gui/icons/svg/attachments.svg b/retroshare-gui/src/gui/icons/svg/attachments.svg
new file mode 100644
index 000000000..4aed39265
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/attachments.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="128"
+   version="1.0"
+   viewBox="0 0 176 176"
+   width="128"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="attachments.svg"
+   inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\attachments.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"><metadata
+     id="metadata20"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs18" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="3.0341309"
+     inkscape:cx="77.428349"
+     inkscape:cy="56.305717"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:snap-grids="true"
+     inkscape:snap-text-baseline="false" /><g
+     id="Artboard"
+     transform="translate(0,66)" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Layer 1"
+     style="display:inline"
+     transform="translate(0,66)"><path
+       style="fill:#000000;fill-opacity:0.15686275;stroke-width:2.0708437"
+       sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
+       id="use4188"
+       d="M 44.090446,93.263012 C 36.60259,93.26473 29.049256,90.31345 23.296365,84.559964 17.540579,78.805052 14.586684,71.248839 14.588708,63.762419 14.578631,56.714431 17.235414,49.610791 22.586516,44.268625 l 1.228456,-1.229034 73.807296,-73.810749 c 7.023462,-7.033281 16.348102,-10.522805 25.643592,-10.510118 9.88016,-0.0041 19.86818,3.891902 27.49306,11.514173 7.61737,7.621106 11.51185,17.603953 11.50984,27.4835423 0.009,9.2986616 -3.47829,18.6209827 -10.51011,25.6482117 -22.19267,22.190182 -42.74228,42.759514 -62.090436,61.547843 -2.356316,2.288138 -6.947381,2.559968 -9.094662,0.41551 -2.211303,-2.208399 -2.355168,-6.664588 0.415584,-9.366387 C 100.49719,56.939042 142.5393,14.141181 142.5393,14.141181 c 4.45924,-4.4687669 6.67705,-10.3154133 6.68745,-16.4251041 -0.001,-6.4740034 -2.54289,-13.1109589 -7.69179,-18.2615999 -5.15065,-5.152375 -11.79106,-7.691786 -18.2688,-7.696403 -6.10712,0.01204 -11.9526,2.22848 -16.41878,6.689751 l -73.812767,73.813052 -1.227304,1.228169 c -2.782271,2.788629 -4.164763,6.41717 -4.176873,10.272442 0.0041,4.083986 1.60198,8.29087 4.888447,11.578776 3.283004,3.279826 7.486989,4.876057 11.571857,4.88065 3.854685,-0.01203 7.482949,-1.393715 10.27359,-4.176 l 52.2275,-52.224822 4.37386,-4.373591 c 1.0479,-1.055682 1.56941,-2.39779 1.57949,-3.93459 0,-1.620148 -0.63109,-3.323089 -1.98706,-4.679333 -1.35881,-1.3594062 -3.06204,-1.9881997 -4.68075,-1.9928177 -1.53623,0.013254 -2.87633,0.5356379 -3.93345,1.5852657 0,0 -36.737225,36.900144 -43.141031,43.526168 -2.533705,2.621625 -7.447295,2.364616 -9.606654,7e-6 -2.146619,-2.350651 -1.908387,-6.726026 0.864761,-9.510726 6.658412,-6.686146 42.656956,-43.2330758 42.656956,-43.2330758 3.613556,-3.6253763 8.433938,-5.4183106 13.158838,-5.4067739 5.02371,-0.00415 10.07311,1.9809959 13.90618,5.8123196 3.82209,3.8281512 5.80569,8.8732211 5.80569,13.8992641 0.0103,4.722021 -1.78082,9.541535 -5.40217,13.156813 l -4.37531,4.373593 -52.227216,52.226921 c -5.335236,5.339266 -12.419565,7.99521 -19.452563,7.993769 l -0.0409,-2.93e-4 v 0 z"
+       inkscape:connector-curvature="0" /><g
+       id="g16"
+       transform="matrix(1.2942773,0,0,1.2942773,-23.539199,-4.5703125)"><g
+         id="g12"><path
+           inkscape:connector-curvature="0"
+           d="m 52.721094,72.291436 c -5.785112,0.05327 -11.641306,-2.174445 -16.125925,-6.579667 -4.486865,-4.406304 -6.821488,-10.223738 -6.871883,-16.007767 -0.05672,-5.44521 1.946631,-10.951928 6.04382,-15.11643 l 0.940577,-0.958077 56.511309,-57.538488 c 5.377523,-5.482663 12.557528,-8.243386 19.739318,-8.298095 7.63339,-0.07177 15.37719,2.868994 21.32107,8.705045 5.93808,5.835208 9.01624,13.5209371 9.08326,21.1539263 0.0715,7.184092 -2.55809,14.4107297 -7.94212,19.8887737 -16.99206,17.298173 -32.72596,33.332678 -47.54396,47.982837 -1.804612,1.78417 -5.349786,2.02605 -7.02366,0.384141 -1.723781,-1.690862 -1.865859,-5.132718 0.256076,-7.239362 14.939916,-14.832244 47.124654,-48.189692 47.124654,-48.189692 3.4142,-3.4835213 5.0871,-8.0160384 5.05273,-12.7364609 -0.0457,-5.0018134 -2.05563,-10.1118911 -6.06942,-14.0555431 -4.01515,-3.944983 -9.16317,-5.860847 -14.16791,-5.819458 -4.71827,0.05169 -9.21912,1.804681 -12.63873,5.282459 l -56.515517,57.540301 -0.939692,0.957403 c -2.130231,2.173807 -3.173162,4.986819 -3.155762,7.965487 0.03154,3.155262 1.295232,6.394415 3.857178,8.911842 2.559215,2.511214 5.818295,3.715285 8.974299,3.690485 2.978049,-0.03605 5.77166,-1.128717 7.908402,-3.297683 L 100.52776,18.206 l 3.3489,-3.409396 c 0.80228,-0.822895 1.19588,-1.863425 1.19301,-3.05083 -0.0112,-1.251726 -0.51065,-2.563041 -1.56768,-3.6014632 -1.05926,-1.0408503 -2.37954,-1.5148338 -3.630189,-1.5071657 -1.186801,0.020901 -2.218534,0.4337938 -3.027982,1.2520738 0,0 -28.127115,28.7640491 -33.028714,33.9277661 -1.939347,2.043052 -5.737375,1.878588 -7.422109,0.06668 -1.674793,-1.801218 -1.521101,-5.18329 0.602108,-7.353998 5.097891,-5.211934 32.656749,-33.69796164 32.656749,-33.69796164 2.766676,-2.82604606 6.478461,-4.24472176 10.129002,-4.26860216 3.881295,-0.038066 7.796245,1.4606072 10.784265,4.39409167 2.97952,2.93110473 4.54706,6.81516313 4.58195,10.69828813 0.0408,3.648164 -1.30965,7.384155 -4.08241,10.202455 l -3.35001,3.409408 -39.988325,40.713033 c -4.084951,4.162151 -9.539876,6.263301 -14.973587,6.310999 l -0.0316,5.9e-5 v 0 z"
+           id="path3"
+           sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
+           style="fill:#039bd5;fill-opacity:1;stroke-width:1.60000002" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/message.svg b/retroshare-gui/src/gui/icons/svg/message.svg
index 81fcd8254..21916df36 100644
--- a/retroshare-gui/src/gui/icons/svg/message.svg
+++ b/retroshare-gui/src/gui/icons/svg/message.svg
@@ -12,18 +12,18 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg4155"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    xml:space="preserve"
    width="80"
    height="80"
    viewBox="0 0 80 80"
    sodipodi:docname="message.svg"
-   inkscape:export-filename="C:\Users\Mustermann\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\message.png"
+   inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\message.png"
    inkscape:export-xdpi="153.60001"
    inkscape:export-ydpi="153.60001"><metadata
      id="metadata4161"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs4159"><linearGradient
        id="linearGradient4148"
        osb:paint="solid"><stop
@@ -38,13 +38,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1152"
-     inkscape:window-height="801"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
      id="namedview4157"
      showgrid="false"
      inkscape:zoom="5.11875"
-     inkscape:cx="22.066693"
-     inkscape:cy="66.571881"
+     inkscape:cx="9.5726496"
+     inkscape:cy="41.771361"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -64,6 +64,6 @@
        id="rect3"
        transform="scale(1,-1)" /><path
        inkscape:connector-curvature="0"
-       d="M 62.59383,14.011166 44.82995,31.87346 62.643037,49.63734 V 14.011166 h -0.0492 z M 4.8735216,10.66506 22.785025,28.576564 26.721618,24.689177 c 1.476222,-1.476223 3.247689,-2.460373 5.412815,-2.460373 2.165128,0 3.936596,0.98415 5.412819,2.460373 L 41.483845,28.576564 59.395347,10.66506 Z M 59.493762,53.377103 33.955109,27.740037 c -0.492074,-0.492075 -0.93494,-0.787319 -1.820676,-0.787319 -0.885732,0 -1.3286,0.295244 -1.820675,0.787319 L 4.7751066,53.377103 Z M 1.6750374,49.63734 19.488126,31.87346 1.6750374,14.011166 Z"
+       d="m 61.161264,15.970821 -16.879585,16.9731 16.926343,16.879586 V 15.970821 h -0.04675 z M 6.3142996,12.791285 23.33416,29.811147 27.074788,26.117276 c 1.402735,-1.402737 3.086017,-2.337895 5.143362,-2.337895 2.057347,0 3.740631,0.935158 5.143366,2.337895 l 3.740628,3.693871 17.019859,-17.019862 z M 58.215519,53.377103 33.948192,29.016262 c -0.467578,-0.467579 -0.888398,-0.748126 -1.730042,-0.748126 -0.84164,0 -1.262462,0.280547 -1.73004,0.748126 L 6.2207837,53.377103 Z M 3.2750374,49.823507 20.201382,32.943921 3.2750374,15.970821 Z"
        id="path8"
-       style="fill:#039bd5;fill-opacity:1;stroke-width:1.4163276" /></g></svg>
\ No newline at end of file
+       style="fill:#039bd5;fill-opacity:1;stroke-width:1.3458221" /></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/profile.svg b/retroshare-gui/src/gui/icons/svg/profile.svg
index c915ebd49..dd7d555f2 100644
--- a/retroshare-gui/src/gui/icons/svg/profile.svg
+++ b/retroshare-gui/src/gui/icons/svg/profile.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg4155"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    xml:space="preserve"
    width="80"
    height="80"
@@ -19,7 +19,7 @@
    sodipodi:docname="profile.svg"><metadata
      id="metadata4161"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs4159" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -30,12 +30,12 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="706"
+     inkscape:window-height="705"
      id="namedview4157"
      showgrid="false"
-     inkscape:zoom="7.2390057"
-     inkscape:cx="21.406376"
-     inkscape:cy="40.981104"
+     inkscape:zoom="5.11875"
+     inkscape:cx="39.083023"
+     inkscape:cy="35.4574"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -43,35 +43,33 @@
      id="g4163"
      inkscape:groupmode="layer"
      inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,80)"><path
-       inkscape:connector-curvature="0"
-       id="path4167"
-       style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><g
-       transform="matrix(0.11606694,0,0,-0.11606694,7.5674886,58.025781)"
-       id="g3"><g
-         id="g5"><path
-           style="fill:#ffffff"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><g
+       transform="matrix(0.13649874,0,0,-0.13649874,3.2292754,61.74954)"
+       id="g3"
+       style="fill:#039bd5;fill-opacity:1"><g
+         id="g5"
+         style="fill:#039bd5;fill-opacity:1"><path
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
-           d="m 382.93,100.232 -94.965,0 0,-0.833 c 0,-13.808 -11.193,-25 -25,-25 l -17.775,0 c -0.524,-13.343 -11.504,-24 -24.975,-24 l -17.5,0 c -13.471,0 -24.449,10.657 -24.975,24 l -17.775,0 c -13.807,0 -25,11.192 -25,25 l 0,0.833 -94.965,0 c -22.056,0 -40,17.944 -40,40 L 0,332.53 c 0,22.057 17.944,40 40,40 l 342.93,0 c 22.055,0 40,-17.943 40,-40 l 0,-192.298 c 0,-22.056 -17.946,-40 -40,-40 z M 211.465,74.714 c 8.422,0 15.25,6.827 15.25,15.25 0,8.423 -6.828,15.25 -15.25,15.25 -8.422,0 -15.25,-6.827 -15.25,-15.25 0,-8.423 6.828,-15.25 15.25,-15.25 z M 392.93,332.529 c 0,5.515 -4.486,10 -10,10 l -342.93,0 c -5.514,0 -10,-4.485 -10,-10 l 0,-192.297 c 0,-5.514 4.486,-10 10,-10 l 95.518,0 0,0.065 c 0,13.808 11.193,25 25,25 l 101.895,0 c 13.807,0 25,-11.192 25,-25 l 0,-0.065 95.518,0 c 5.515,0 10,4.486 10,10 l -10e-4,192.297 0,0 z"
+           d="m 382.93,100.232 h -94.965 v -0.833 c 0,-13.808 -11.193,-25 -25,-25 H 245.19 c -0.524,-13.343 -11.504,-24 -24.975,-24 h -17.5 c -13.471,0 -24.449,10.657 -24.975,24 h -17.775 c -13.807,0 -25,11.192 -25,25 v 0.833 H 40 c -22.056,0 -40,17.944 -40,40 V 332.53 c 0,22.057 17.944,40 40,40 h 342.93 c 22.055,0 40,-17.943 40,-40 V 140.232 c 0,-22.056 -17.946,-40 -40,-40 z M 211.465,74.714 c 8.422,0 15.25,6.827 15.25,15.25 0,8.423 -6.828,15.25 -15.25,15.25 -8.422,0 -15.25,-6.827 -15.25,-15.25 0,-8.423 6.828,-15.25 15.25,-15.25 z M 392.93,332.529 c 0,5.515 -4.486,10 -10,10 H 40 c -5.514,0 -10,-4.485 -10,-10 V 140.232 c 0,-5.514 4.486,-10 10,-10 h 95.518 v 0.065 c 0,13.808 11.193,25 25,25 h 101.895 c 13.807,0 25,-11.192 25,-25 v -0.065 h 95.518 c 5.515,0 10,4.486 10,10 z"
            id="path7" /><path
-           style="fill:#ffffff"
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
-           d="m 353.165,184.131 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.523 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.477 10,-10 0,-5.523 -4.477,-10 -10,-10 z"
+           d="M 353.165,184.131 H 215.099 c -5.522,0 -10,4.477 -10,10 0,5.523 4.478,10 10,10 h 138.066 c 5.521,0 10,-4.477 10,-10 0,-5.523 -4.477,-10 -10,-10 z"
            id="path9" /><path
-           style="fill:#ffffff"
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
-           d="m 353.165,234.132 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
+           d="M 353.165,234.132 H 215.099 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 h 138.066 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
            id="path11" /><path
-           style="fill:#ffffff"
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
-           d="m 353.165,284.132 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
+           d="M 353.165,284.132 H 215.099 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 h 138.066 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
            id="path13" /><path
-           style="fill:#ffffff"
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
-           d="m 154.844,264.318 -17.537,-8.074 -8.424,-7.104 -13.059,12.988 6.01,40.172 c 0.021,0.146 -0.016,0.297 -0.104,0.418 l -6.716,9.189 c -0.106,0.146 -0.276,0.232 -0.458,0.232 -0.182,0 -0.352,-0.086 -0.459,-0.232 l -6.715,-9.189 c -0.088,-0.121 -0.125,-0.271 -0.104,-0.418 l 6.01,-40.174 -13.057,-12.986 -8.424,7.104 -17.538,8.074 c -2.595,1.063 -5.655,3.222 -6.441,5.496 0,0 -19.063,45.383 -8.724,45.383 l 110.903,0 c 10.339,0 -8.723,-45.383 -8.723,-45.383 -1.128,-2.701 -3.845,-4.43 -6.44,-5.496 z"
+           d="m 154.844,264.318 -17.537,-8.074 -8.424,-7.104 -13.059,12.988 6.01,40.172 c 0.021,0.146 -0.016,0.297 -0.104,0.418 l -6.716,9.189 c -0.106,0.146 -0.276,0.232 -0.458,0.232 -0.182,0 -0.352,-0.086 -0.459,-0.232 l -6.715,-9.189 c -0.088,-0.121 -0.125,-0.271 -0.104,-0.418 l 6.01,-40.174 -13.057,-12.986 -8.424,7.104 -17.538,8.074 c -2.595,1.063 -5.655,3.222 -6.441,5.496 0,0 -19.063,45.383 -8.724,45.383 h 110.903 c 10.339,0 -8.723,-45.383 -8.723,-45.383 -1.128,-2.701 -3.845,-4.43 -6.44,-5.496 z"
            id="path15" /><path
-           style="fill:#ffffff"
+           style="fill:#039bd5;fill-opacity:1"
            inkscape:connector-curvature="0"
            d="m 114.557,248.884 c 17.937,0 31.32,-16.711 31.625,-44.734 0.195,-19.447 -9.066,-31.084 -31.625,-31.084 -22.559,0 -31.822,11.637 -31.625,31.084 0.304,28.023 13.689,44.734 31.625,44.734 z"
            id="path17" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/video-camera.svg b/retroshare-gui/src/gui/icons/svg/video-camera.svg
new file mode 100644
index 000000000..81d7d9333
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/video-camera.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="512px"
+   viewBox="0 -16 512 512"
+   width="512px"
+   class=""
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="video-camera.svg"
+   inkscape:export-filename="C:\Users\Mustermann\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\video-camera.png"
+   inkscape:export-xdpi="24"
+   inkscape:export-ydpi="24"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1152"
+     inkscape:window-height="801"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <g
+     id="g16"
+     transform="matrix(0.91525424,0,0,0.91525424,23.864407,21.694915)">
+    <path
+       d="M 91,210 H 0 V 480 H 391 V 210 Z m 60,223.02344 V 256.97656 L 283.03906,345 Z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path2"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="m 181,313.02344 v 63.95312 L 228.96094,345 Z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path4"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="m 271,75 c -16.53906,0 -30,13.460938 -30,30 0,16.53906 13.46094,30 30,30 16.53906,0 30,-13.46094 30,-30 0,-16.539062 -13.46094,-30 -30,-30 z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path6"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="M 376,105 C 376,47.109375 328.89062,0 271,0 213.10937,0 166,47.109375 166,105 c 0,57.89062 47.10937,105 105,105 57.89062,0 105,-47.10938 105,-105 z m -105,60 c -33.08984,0 -60,-26.91016 -60,-60 0,-33.089844 26.91016,-60 60,-60 33.08984,0 60,26.910156 60,60 0,33.08984 -26.91016,60 -60,60 z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path8"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="m 91,150 0.01563,-15 c -0.01563,0 -0.03125,0 -0.03125,0.0156 z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path10"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="M 166,135 C 166,93.648438 132.35156,60 91,60 49.648438,60 16,93.648438 16,135 c 0,41.35156 33.648438,75 75,75 41.35156,0 75,-33.64844 75,-75 z m -75,30 c -16.539062,0 -30,-13.46094 -30,-30 0,-16.53906 13.460938,-30 30,-30 16.53906,0 30,13.46094 30,30 0,16.53906 -13.46094,30 -30,30 z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path12"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+    <path
+       d="m 421,275.72656 v 138.54688 l 91,45 V 230.72656 Z m 0,0"
+       data-original="#000000"
+       class="active-path"
+       data-old_color="#000000"
+       id="path14"
+       inkscape:connector-curvature="0"
+       style="fill:#039bd5" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a54d7fa26..cae7b1982 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -10,8 +10,6 @@
     <file>images/switch01.png</file>
     <file>images/switch10.png</file>
     <file>images/switch11.png</file>
-    <file>images/add_chat24.png</file>
-    <file>images/RSS_004_32.png</file>
     <file>images/mail-encrypted-full.png</file>
     <file>images/mail-signed-full.png</file>
     <file>images/document-edit-sign.png</file>
@@ -19,7 +17,6 @@
     <file>images/inbox_22.png</file>
     <file>images/blue_lock.png</file>
     <file>images/blue_lock_open.png</file>
-    <file>images/d-chat64.png</file>
     <file>images/edit_24.png</file>
     <file>images/streaming.png</file>
     <file>images/white-bubble-64.png</file>
@@ -33,7 +30,6 @@
     <file>images/browsable_128_blue.png</file>
     <file>images/blank_128_green.png</file>
     <file>images/blank_128_blue.png</file>
-    <file>images/door_in.png</file>
     <file>images/tor-logo.png</file>
     <file>images/help/addafriend.png</file>
     <file>images/help/addfriendkey.png</file>
@@ -41,29 +37,14 @@
     <file>icons/help_64.png</file>
     <file>images/help/natgreen.png</file>
     <file>images/help/natred.png</file>
-    <file>images/attach.png</file>
     <file>images/pgp.png</file>
     <file>images/rs_wizard.png</file>
     <file>images/avatar_request.png</file>
     <file>images/avatar_refused.png</file>
     <file>images/avatar_request_unknown.png</file>
-    <file>images/backblue.png</file>
-    <file>images/backchat.png</file>
     <file>images/buttonframe.png</file>
-    <file>images/btn1.png</file>
-    <file>images/btn2.png</file>
-    <file>images/btn3.png</file>
-    <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/btn_blue.png</file>
     <file>images/btn_blue_hover.png</file>
-    <file>images/btn_green.png</file>
-    <file>images/btn_green_hover.png</file>
-    <file>images/btn_green_pressed.png</file>
     <file>images/connect_creating.png</file>
     <file>images/dht16.png</file>
     <file>images/dht32.png</file>
@@ -81,10 +62,6 @@
     <file>help/licence.html</file>
     <file>help/thanks.html</file>
     <file>images/accepted16.png</file>
-    <file>images/add_image24.png</file>
-    <file>images/add_channel64.png</file>
-    <file>images/add_channel24.png</file>
-    <file>images/add_channel32.png</file>
     <file>images/admin-16.png</file>
     <file>images/admin-32.png</file>
     <file>images/admin-24.png</file>
@@ -104,30 +81,12 @@
     <file>images/avatarstatus-bg-away-70.png</file>
     <file>images/avatarstatus-bg-busy-70.png</file>
     <file>images/avatarstatus-bg-offline-70.png</file>
-    <file>images/browse-looking.gif</file>
     <file>images/back.png</file>
-    <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>
-    <file>images/channels24.png</file>
-    <file>images/channels32.png</file>
-    <file>images/channels_new.png</file>
-    <file>images/channelsred.png</file>
-    <file>images/channelsyellow.png</file>
-    <file>images/channelsgreen.png</file>
-    <file>images/channelsblue.png</file>
     <file>images/copyrslink.png</file>
     <file>images/contacts24.png</file>
     <file>images/contactsclosed24.png</file>
     <file>images/connection.png</file>
-    <file>images/contact_new.png</file>
-    <file>images/contact_new22.png</file>
-    <file>images/contact.png</file>
-    <file>images/contact22.png</file>
     <file>images/Client0.png</file>
     <file>images/Client1.png</file>
     <file>images/Client2.png</file>
@@ -147,7 +106,6 @@
     <file>images/FileTypeProgram.png</file>
     <file>images/FileTypeVideo.png</file>
     <file>images/fonts.png</file>
-    <file>images/folder16.png</file>
     <file>images/foldermail.png</file>
     <file>images/folderopen.png</file>
     <file>images/fileopen.png</file>
@@ -157,27 +115,14 @@
     <file>images/graph-checking.png</file>
     <file>images/graph-blue.png</file>
     <file>images/add-share24.png</file>
-    <file>images/add_24x24.png</file>
-    <file>images/advsearch_24x24.png</file>
-    <file>images/amsn16.png</file>
-    <file>images/attachment.png</file>
     <file>images/avatar_background.png</file>
-    <file>images/backgroundimage.png</file>
     <file>images/button_cancel.png</file>
     <file>images/calendar.png</file>
     <file>images/chat.png</file>
-    <file>images/chat_22.png</file>
     <file>images/chat_24.png</file>
-    <file>images/chat_32.png</file>
-    <file>images/chat_64.png</file>
-    <file>images/chat_x24.png</file>
-    <file>images/chat_red24.png</file>
     <file>images/cancel.png</file>
     <file>images/close-down.png</file>
     <file>images/close_normal.png</file>
-    <file>images/console-small-down.png</file>
-    <file>images/console-small-hover.png</file>
-    <file>images/console-small-up.png</file>
     <file>images/contact_new128.png</file>
     <file>images/copy.png</file>
     <file>images/delete.png</file>
@@ -198,16 +143,8 @@
     <file>images/edit-italic.png</file>
     <file>images/edit-underline.png</file>
     <file>images/edit_remove24.png</file>
-    <file>images/encrypted16.png</file>
-    <file>images/encrypted22.png</file>
-    <file>images/encrypted32.png</file>
-    <file>images/encrypted48.png</file>
     <file>images/disabled_plugin_48.png</file>
-    <file>images/evolution.png</file>
-    <file>images/exit_24x24.png</file>
-    <file>images/exit_32.png</file>
     <file>images/expand_frame.png</file>
-    <file>images/exportpeers_16x16.png</file>
     <file>images/extension_32.png</file>
     <file>images/filefind.png</file>
     <file>images/fileinfo.png</file>
@@ -227,7 +164,6 @@
     <file>images/fileshare64.png</file>
     <file>images/find.png</file>
     <file>images/find-16.png</file>
-    <file>images/emoticons/kopete/kopete020.png</file>
     <file>images/flags/af.png</file>
     <file>images/flags/bg.png</file>
     <file>images/flags/zh_CN.png</file>
@@ -261,16 +197,7 @@
     <file>images/folder-outbox.png</file>
     <file>images/folder-sent.png</file>
     <file>images/folder-trash.png</file>
-    <file>images/folder_doments.png</file>
-    <file>images/folder_green.png</file>
-    <file>images/folder_red.png</file>
-    <file>images/folder_grey.png</file>
-    <file>images/folder_yellow.png</file>
-    <file>images/folder_open.png</file>
-    <file>images/folder_video.png</file>
-    <file>images/folder_blueshared.png</file>
     <file>images/forward.png</file>
-    <file>images/friendsfolder24.png</file>
     <file>images/kgames.png</file>
     <file>images/go-down.png</file>
     <file>images/go-top.png</file>
@@ -278,24 +205,17 @@
     <file>images/go-bottom.png</file>
     <file>images/graph-area.png</file>
     <file>images/graph-line.png</file>
-    <file>images/groupchat.png</file>
-    <file>images/genbackground.png</file>
     <file>images/gohome.png</file>
     <file>images/gpgp_key_generate.png</file>
-    <file>images/help.png</file>
-    <file>images/help24.png</file>
     <file>images/hide_toolbox_frame.png</file>
     <file>images/hide_frame.png</file>
     <file>images/highlight.png</file>
-    <file>images/hi16-app-ktorrent.png</file>
-    <file>images/hi24-app-ktorrent.png</file>
     <file>images/hot_0.png</file>
     <file>images/hot_1.png</file>
     <file>images/hot_2.png</file>
     <file>images/hot_3.png</file>
     <file>images/hot_4.png</file>
     <file>images/hot_5.png</file>
-    <file>images/image16.png</file>
     <file>images/imageblocked_24.png</file>
     <file>images/info16.png</file>
     <file>images/im-user.png</file>
@@ -307,37 +227,11 @@
     <file>images/connect_friend.png</file>
     <file>images/kalarm.png</file>
     <file>images/kbackgammon.png</file>
-    <file>images/kblogger.png</file>
-    <file>images/hi48-app-kblogger.png</file>
-    <file>images/hi64-app-kblogger.png</file>
-    <file>images/transfers_new.png</file>
     <file>images/kcmsystem24.png</file>
-    <file>images/kdmconfig.png</file>
-    <file>images/konsole.png</file>
-    <file>images/newsfeed128.png</file>
-    <file>images/newsfeed128_notify.png</file>
-    <file>images/konversation.png</file>
-    <file>images/konversation16.png</file>
-    <file>images/konversation128.png</file>
-    <file>images/konv_message2.png</file>
-    <file>images/konv_message3.png</file>
-    <file>images/konv_message64.png</file>
-    <file>images/konversation64.png</file>
-    <file>images/forums_new.png</file>
-    <file>images/ksysguard.png</file>
-    <file>images/ksysguard32.png</file>
-    <file>images/ktorrent.png</file>
-    <file>images/ktorrent32.png</file>
-    <file>images/knewsticker24.png</file>
-    <file>images/library.png</file>
-    <file>images/loadcert16.png</file>
     <file>images/ledoff1.png</file>
     <file>images/ledon1.png</file>
     <file>images/locale.png</file>
     <file>images/looknfeel.png</file>
-    <file>images/lphoto.png</file>
-    <file>images/lphoto16.png</file>
-    <file>images/lphoto24.png</file>
     <file>images/logo/logo_16.png</file>
     <file>images/logo/logo_24.png</file>
     <file>images/logo/logo_24_0.png</file>
@@ -352,10 +246,6 @@
     <file>images/logo/logo_info.png</file>
     <file>images/logo/logo_splash.png</file>
     <file>images/logo/logo_web_nobackground.png</file>
-    <file>images/logobar/logo_bar_fill.png</file>
-    <file>images/logobar/logo_bar_start.png</file>
-    <file>images/logobar/rslogo.png</file>
-    <file>images/logobar/rslogo2.png</file>
     <file>images/mail-message-new.png</file>
     <file>images/mail-signed.png</file>
     <file>images/mail-signature-unknown.png</file>
@@ -382,16 +272,9 @@
     <file>images/message-state-header.png</file>
     <file>images/message-state-new.png</file>
     <file>images/message-news.png</file>
-    <file>images/message_new.png</file>
     <file>images/message.png</file>
-    <file>images/messenger.png</file>
     <file>images/mute-off-16.png</file>
     <file>images/mute-on-16.png</file>
-    <file>images/my_documents_16.png</file>
-    <file>images/my_documents_22.png</file>
-    <file>images/network.png</file>
-    <file>images/network16.png</file>
-    <file>images/network32.png</file>
     <file>images/new-mail-alert.png</file>
     <file>images/new_forum16.png</file>
     <file>images/newmsg.png</file>
@@ -439,7 +322,6 @@
     <file>images/save24.png</file>
     <file>images/send24.png</file>
     <file>images/settings.png</file>
-    <file>images/settings16.png</file>
     <file>images/show_toolbox_frame.png</file>
     <file>images/start.png</file>
     <file>images/stop.png</file>
@@ -449,7 +331,6 @@
     <file>images/StatisticsDetail.png</file>
     <file>images/status_unknown.png</file>
     <file>images/startall.png</file>
-    <file>images/server_24x24.png</file>
     <file>images/sort_incr.png</file>
     <file>images/sort_decrease.png</file>
     <file>images/sound.png</file>
@@ -459,10 +340,7 @@
     <file>images/tag24.png</file>
     <file>images/transferupdown.png</file>
     <file>images/tools_wizard.png</file>
-    <file>images/typing.png</file>
-    <file>images/trustsettings.png</file>
     <file>images/uploads.png</file>
-    <file>images/headerFrame.png</file>
     <file>images/loader/indicator-16.gif</file>
     <file>images/loader/indicator-32.gif</file>
     <file>images/loader/circleball-16.gif</file>
@@ -473,8 +351,6 @@
     <file>images/mimetypes/source_c.png</file>
     <file>images/mimetypes/source_cpp.png</file>
     <file>images/mimetypes/source_h.png</file>
-    <file>images/view-certificate-copy-32.png</file>
-    <file>images/view-certificate-export-32.png</file>
     <file>images/textedit/textbold.png</file>
     <file>images/textedit/textitalic.png</file>
     <file>images/textedit/textunder.png</file>
@@ -507,9 +383,6 @@
     <file>images/textedit/hi22-action-format-text-blockquote.png</file>
     <file>images/textedit/hi22-action-format-text-code.png</file>
     <file>images/textedit/hi22-action-insert-more-mark.png</file>
-    <file>images/toaster/chat.png</file>
-    <file>images/toaster/hangup.png</file>
-    <file>images/toaster/pickup.png</file>
     <file>images/toaster/backgroundtoaster.png</file>
     <file>images/thumb-default-video.png</file>
     <file>images/user/add_user24.png</file>
@@ -556,24 +429,13 @@
     <file>images/up1down0.png</file>
     <file>images/underconstruction.png</file>
     <file>images/user.png</file>
-    <file>images/view-certificate-sign-32.png</file>
     <file>images/view_calendar_day.png</file>
     <file>images/view_calendar_week.png</file>
     <file>images/view_calendar_month.png</file>
     <file>images/view_calendar_list.png</file>
     <file>images/view_split_top_bottom.png</file>
-    <file>images/vote_up.png</file>
-    <file>images/vote_down.png</file>
-    <file>images/vote_neutral.png</file>
     <file>images/window_fullscreen.png</file>
     <file>images/window_nofullscreen.png</file>
-    <file>images/identity/identities_32.png</file>
-    <file>images/identity/identity_64.png</file>
-    <file>images/identity/identity_create_32.png</file>
-    <file>images/identity/identity_create_64.png</file>
-    <file>images/identity/identity_delete_32.png</file>
-    <file>images/identity/identity_edit_32.png</file>
-    <file>images/identity/identity_edit_64.png</file>
     <file>qss/chat/standard/private/info.xml</file>
     <file>qss/chat/standard/private/incoming.htm</file>
     <file>qss/chat/standard/private/outgoing.htm</file>
@@ -633,43 +495,26 @@
     <file>qss/chat/compact/history/variants/Colored.css</file>
     <file>qss/stylesheet/qss.default</file>
     <file>qss/stylesheet/Standard.qss</file>
-    <file>images/connect/connectFriendWatermark.png</file>
-    <file>images/connect/connectFriendLogo.png</file>
-    <file>images/connect/connectFriendBanner.png</file>
-    <file>images/connect/connectFriendBanner1.png</file>
-    <file>images/connect/info16.png</file>
-    <file>images/connect/mail_send.png</file>
     <file>images/tags/pgp-known.png</file>
     <file>images/tags/pgp-unknown.png</file>
-    <file>images/tags/anon.png</file>
     <file>images/tags/dev-ambassador.png</file>
     <file>images/tags/dev-translator.png</file>
     <file>images/tags/dev-patcher.png</file>
     <file>images/tags/developer.png</file>
-    <file>images/circles/circles_32.png</file>
-    <file>images/circles/circles_64.png</file>
-    <file>images/newsfeed/news-feed-32.png</file>
-    <file>images/newsfeed/news-feed-notify-32.png</file>
     <file>images/share-icon-16.png</file>
-    <file>images/view-certificate-sign-48.png</file>
     <file>images/toasterEnable.png</file>
     <file>images/toasterDisable.png</file>
-    <file>images/library_edit.png</file>
-    <file>images/library_view.png</file>
-    <file>images/library_add.png</file>
-    <file>images/library64.png</file>
-    <file>images/library16.png</file>
-    <file>images/btn_red_pressed.png</file>
-    <file>images/btn_red_hover.png</file>
-    <file>images/btn_red.png</file>
     <file>images/view-feeds.png</file>
     <file>images/view-files.png</file>
     <file>images/emblem-web.png</file>
-    <file>images/rsmessenger16.png</file>
-    <file>images/rsmessenger32.png</file>
     <file>images/rsmessenger48.png</file>
     <file>images/SmileyText.png</file>
     <file>images/SimpleText.png</file>
     <file>images/ColoredText.png</file>
+    <file>images/update.png</file>
+    <file>images/folder_green.png</file>
+    <file>images/folder_red.png</file>
+    <file>images/folder_grey.png</file>
+    <file>images/folder_yellow.png</file>
   </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/images/Eterm.png b/retroshare-gui/src/gui/images/Eterm.png
deleted file mode 100644
index b2027f5a9..000000000
Binary files a/retroshare-gui/src/gui/images/Eterm.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/Login Manager.png b/retroshare-gui/src/gui/images/Login Manager.png
deleted file mode 100644
index 37371456c..000000000
Binary files a/retroshare-gui/src/gui/images/Login Manager.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/RSS_004_32.png b/retroshare-gui/src/gui/images/RSS_004_32.png
deleted file mode 100644
index c6abd93dc..000000000
Binary files a/retroshare-gui/src/gui/images/RSS_004_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_24x24.png b/retroshare-gui/src/gui/images/add_24x24.png
deleted file mode 100644
index bbf64ca18..000000000
Binary files a/retroshare-gui/src/gui/images/add_24x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_channel24.png b/retroshare-gui/src/gui/images/add_channel24.png
deleted file mode 100644
index 8ba048f74..000000000
Binary files a/retroshare-gui/src/gui/images/add_channel24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_channel32.png b/retroshare-gui/src/gui/images/add_channel32.png
deleted file mode 100644
index 62d178e11..000000000
Binary files a/retroshare-gui/src/gui/images/add_channel32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_channel64.png b/retroshare-gui/src/gui/images/add_channel64.png
deleted file mode 100644
index ebc17374c..000000000
Binary files a/retroshare-gui/src/gui/images/add_channel64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_chat24.png b/retroshare-gui/src/gui/images/add_chat24.png
deleted file mode 100644
index 95585c957..000000000
Binary files a/retroshare-gui/src/gui/images/add_chat24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add_image24.png b/retroshare-gui/src/gui/images/add_image24.png
deleted file mode 100644
index 396035fe9..000000000
Binary files a/retroshare-gui/src/gui/images/add_image24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/advsearch_24x24.png b/retroshare-gui/src/gui/images/advsearch_24x24.png
deleted file mode 100644
index 94182e8fe..000000000
Binary files a/retroshare-gui/src/gui/images/advsearch_24x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/amsn16.png b/retroshare-gui/src/gui/images/amsn16.png
deleted file mode 100644
index 54edfb50e..000000000
Binary files a/retroshare-gui/src/gui/images/amsn16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/attach.png b/retroshare-gui/src/gui/images/attach.png
deleted file mode 100644
index 53f31750b..000000000
Binary files a/retroshare-gui/src/gui/images/attach.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/attachment.png b/retroshare-gui/src/gui/images/attachment.png
deleted file mode 100644
index 89842af21..000000000
Binary files a/retroshare-gui/src/gui/images/attachment.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/backblue.png b/retroshare-gui/src/gui/images/backblue.png
deleted file mode 100644
index 8ca7d7745..000000000
Binary files a/retroshare-gui/src/gui/images/backblue.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/backchat.png b/retroshare-gui/src/gui/images/backchat.png
deleted file mode 100644
index 6ea9c9f49..000000000
Binary files a/retroshare-gui/src/gui/images/backchat.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/backgroundimage.png b/retroshare-gui/src/gui/images/backgroundimage.png
deleted file mode 100644
index f67e5176f..000000000
Binary files a/retroshare-gui/src/gui/images/backgroundimage.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/backgroundl.png b/retroshare-gui/src/gui/images/backgroundl.png
deleted file mode 100644
index 13d166dbe..000000000
Binary files a/retroshare-gui/src/gui/images/backgroundl.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/blockdevice.png b/retroshare-gui/src/gui/images/blockdevice.png
deleted file mode 100644
index 77584164f..000000000
Binary files a/retroshare-gui/src/gui/images/blockdevice.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/blockdevice2.png b/retroshare-gui/src/gui/images/blockdevice2.png
deleted file mode 100644
index 312d63e40..000000000
Binary files a/retroshare-gui/src/gui/images/blockdevice2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/browse-looking.gif b/retroshare-gui/src/gui/images/browse-looking.gif
deleted file mode 100644
index 6da15f60d..000000000
Binary files a/retroshare-gui/src/gui/images/browse-looking.gif and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn1.png b/retroshare-gui/src/gui/images/btn1.png
deleted file mode 100644
index bbe3b7278..000000000
Binary files a/retroshare-gui/src/gui/images/btn1.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn2.png b/retroshare-gui/src/gui/images/btn2.png
deleted file mode 100644
index 92100d787..000000000
Binary files a/retroshare-gui/src/gui/images/btn2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn3.png b/retroshare-gui/src/gui/images/btn3.png
deleted file mode 100644
index bbe3b7278..000000000
Binary files a/retroshare-gui/src/gui/images/btn3.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn4.png b/retroshare-gui/src/gui/images/btn4.png
deleted file mode 100644
index bbe3b7278..000000000
Binary files a/retroshare-gui/src/gui/images/btn4.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_26.png b/retroshare-gui/src/gui/images/btn_26.png
deleted file mode 100644
index 51de8bc89..000000000
Binary files a/retroshare-gui/src/gui/images/btn_26.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_26_hover.png b/retroshare-gui/src/gui/images/btn_26_hover.png
deleted file mode 100644
index 391690431..000000000
Binary files a/retroshare-gui/src/gui/images/btn_26_hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_26_pressed.png b/retroshare-gui/src/gui/images/btn_26_pressed.png
deleted file mode 100644
index 0aa53120d..000000000
Binary files a/retroshare-gui/src/gui/images/btn_26_pressed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_27.png b/retroshare-gui/src/gui/images/btn_27.png
deleted file mode 100644
index bcdf90ded..000000000
Binary files a/retroshare-gui/src/gui/images/btn_27.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_27_hover.png b/retroshare-gui/src/gui/images/btn_27_hover.png
deleted file mode 100644
index 2bc8680d7..000000000
Binary files a/retroshare-gui/src/gui/images/btn_27_hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_green.png b/retroshare-gui/src/gui/images/btn_green.png
deleted file mode 100644
index 3c5526233..000000000
Binary files a/retroshare-gui/src/gui/images/btn_green.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_green_hover.png b/retroshare-gui/src/gui/images/btn_green_hover.png
deleted file mode 100644
index bb98ebced..000000000
Binary files a/retroshare-gui/src/gui/images/btn_green_hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_green_pressed.png b/retroshare-gui/src/gui/images/btn_green_pressed.png
deleted file mode 100644
index 84644b7c4..000000000
Binary files a/retroshare-gui/src/gui/images/btn_green_pressed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_red.png b/retroshare-gui/src/gui/images/btn_red.png
deleted file mode 100644
index 81cad49f5..000000000
Binary files a/retroshare-gui/src/gui/images/btn_red.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_red_hover.png b/retroshare-gui/src/gui/images/btn_red_hover.png
deleted file mode 100644
index 92b724c72..000000000
Binary files a/retroshare-gui/src/gui/images/btn_red_hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/btn_red_pressed.png b/retroshare-gui/src/gui/images/btn_red_pressed.png
deleted file mode 100644
index 604c96d68..000000000
Binary files a/retroshare-gui/src/gui/images/btn_red_pressed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channels.png b/retroshare-gui/src/gui/images/channels.png
deleted file mode 100644
index 3c53997a0..000000000
Binary files a/retroshare-gui/src/gui/images/channels.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channels16.png b/retroshare-gui/src/gui/images/channels16.png
deleted file mode 100644
index e84292c1f..000000000
Binary files a/retroshare-gui/src/gui/images/channels16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channels24.png b/retroshare-gui/src/gui/images/channels24.png
deleted file mode 100644
index 9eb351ae7..000000000
Binary files a/retroshare-gui/src/gui/images/channels24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channels32.png b/retroshare-gui/src/gui/images/channels32.png
deleted file mode 100644
index ddb19884e..000000000
Binary files a/retroshare-gui/src/gui/images/channels32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channels_new.png b/retroshare-gui/src/gui/images/channels_new.png
deleted file mode 100644
index aa8d7a889..000000000
Binary files a/retroshare-gui/src/gui/images/channels_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channelsblue.png b/retroshare-gui/src/gui/images/channelsblue.png
deleted file mode 100644
index c385de26b..000000000
Binary files a/retroshare-gui/src/gui/images/channelsblue.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channelsgreen.png b/retroshare-gui/src/gui/images/channelsgreen.png
deleted file mode 100644
index 8649075b3..000000000
Binary files a/retroshare-gui/src/gui/images/channelsgreen.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channelsred.png b/retroshare-gui/src/gui/images/channelsred.png
deleted file mode 100644
index 5d4e8a35f..000000000
Binary files a/retroshare-gui/src/gui/images/channelsred.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/channelsyellow.png b/retroshare-gui/src/gui/images/channelsyellow.png
deleted file mode 100644
index f6dab53cf..000000000
Binary files a/retroshare-gui/src/gui/images/channelsyellow.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_128.png b/retroshare-gui/src/gui/images/chat_128.png
deleted file mode 100644
index 7212a977d..000000000
Binary files a/retroshare-gui/src/gui/images/chat_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_22.png b/retroshare-gui/src/gui/images/chat_22.png
deleted file mode 100644
index 16d6336f6..000000000
Binary files a/retroshare-gui/src/gui/images/chat_22.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_32.png b/retroshare-gui/src/gui/images/chat_32.png
deleted file mode 100644
index f9c6f2496..000000000
Binary files a/retroshare-gui/src/gui/images/chat_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_48.png b/retroshare-gui/src/gui/images/chat_48.png
deleted file mode 100644
index 4c06659f4..000000000
Binary files a/retroshare-gui/src/gui/images/chat_48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_64.png b/retroshare-gui/src/gui/images/chat_64.png
deleted file mode 100644
index ef6dc9613..000000000
Binary files a/retroshare-gui/src/gui/images/chat_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_red24.png b/retroshare-gui/src/gui/images/chat_red24.png
deleted file mode 100644
index 2384d7ae7..000000000
Binary files a/retroshare-gui/src/gui/images/chat_red24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat_x24.png b/retroshare-gui/src/gui/images/chat_x24.png
deleted file mode 100644
index 163d0d371..000000000
Binary files a/retroshare-gui/src/gui/images/chat_x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/circles/circles-hi.png b/retroshare-gui/src/gui/images/circles/circles-hi.png
deleted file mode 100644
index 539a8f203..000000000
Binary files a/retroshare-gui/src/gui/images/circles/circles-hi.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/circles/circles_128.png b/retroshare-gui/src/gui/images/circles/circles_128.png
deleted file mode 100644
index d2664a82c..000000000
Binary files a/retroshare-gui/src/gui/images/circles/circles_128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/circles/circles_32.png b/retroshare-gui/src/gui/images/circles/circles_32.png
deleted file mode 100644
index 97145faa9..000000000
Binary files a/retroshare-gui/src/gui/images/circles/circles_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/circles/circles_64.png b/retroshare-gui/src/gui/images/circles/circles_64.png
deleted file mode 100644
index 4bf54616d..000000000
Binary files a/retroshare-gui/src/gui/images/circles/circles_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/connectFriendBanner.png b/retroshare-gui/src/gui/images/connect/connectFriendBanner.png
deleted file mode 100644
index 94f6acfcf..000000000
Binary files a/retroshare-gui/src/gui/images/connect/connectFriendBanner.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png b/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png
deleted file mode 100644
index b38760044..000000000
Binary files a/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/connectFriendLogo.png b/retroshare-gui/src/gui/images/connect/connectFriendLogo.png
deleted file mode 100644
index d5ac0af38..000000000
Binary files a/retroshare-gui/src/gui/images/connect/connectFriendLogo.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png b/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png
deleted file mode 100644
index b4bacbdff..000000000
Binary files a/retroshare-gui/src/gui/images/connect/connectFriendLogo2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png b/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png
deleted file mode 100644
index d68db6277..000000000
Binary files a/retroshare-gui/src/gui/images/connect/connectFriendWatermark.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/info16.png b/retroshare-gui/src/gui/images/connect/info16.png
deleted file mode 100644
index fb3b689e9..000000000
Binary files a/retroshare-gui/src/gui/images/connect/info16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/connect/mail_send.png b/retroshare-gui/src/gui/images/connect/mail_send.png
deleted file mode 100644
index 0366228e9..000000000
Binary files a/retroshare-gui/src/gui/images/connect/mail_send.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-big-down.png b/retroshare-gui/src/gui/images/console-big-down.png
deleted file mode 100644
index 4ffbbcf84..000000000
Binary files a/retroshare-gui/src/gui/images/console-big-down.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-big-hover.png b/retroshare-gui/src/gui/images/console-big-hover.png
deleted file mode 100644
index a5163017f..000000000
Binary files a/retroshare-gui/src/gui/images/console-big-hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-big-up.png b/retroshare-gui/src/gui/images/console-big-up.png
deleted file mode 100644
index c88112c81..000000000
Binary files a/retroshare-gui/src/gui/images/console-big-up.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-small-down.png b/retroshare-gui/src/gui/images/console-small-down.png
deleted file mode 100644
index 4c5fa594f..000000000
Binary files a/retroshare-gui/src/gui/images/console-small-down.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-small-hover.png b/retroshare-gui/src/gui/images/console-small-hover.png
deleted file mode 100644
index 9dfb61454..000000000
Binary files a/retroshare-gui/src/gui/images/console-small-hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/console-small-up.png b/retroshare-gui/src/gui/images/console-small-up.png
deleted file mode 100644
index 551d3f923..000000000
Binary files a/retroshare-gui/src/gui/images/console-small-up.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact.png b/retroshare-gui/src/gui/images/contact.png
deleted file mode 100644
index b86f35012..000000000
Binary files a/retroshare-gui/src/gui/images/contact.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact22.png b/retroshare-gui/src/gui/images/contact22.png
deleted file mode 100644
index 2bde2b914..000000000
Binary files a/retroshare-gui/src/gui/images/contact22.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact_new.png b/retroshare-gui/src/gui/images/contact_new.png
deleted file mode 100644
index 0a915b51b..000000000
Binary files a/retroshare-gui/src/gui/images/contact_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact_new22.png b/retroshare-gui/src/gui/images/contact_new22.png
deleted file mode 100644
index c4f7eb816..000000000
Binary files a/retroshare-gui/src/gui/images/contact_new22.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/d-chat64.png b/retroshare-gui/src/gui/images/d-chat64.png
deleted file mode 100644
index 8de20ed54..000000000
Binary files a/retroshare-gui/src/gui/images/d-chat64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/door_in.png b/retroshare-gui/src/gui/images/door_in.png
deleted file mode 100644
index a65ed5884..000000000
Binary files a/retroshare-gui/src/gui/images/door_in.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png
deleted file mode 100644
index 53c1819fe..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete006.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png
deleted file mode 100644
index 563532756..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete007.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png
deleted file mode 100644
index a4788a820..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete008.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png
deleted file mode 100644
index fc8dd7218..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete009.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png
deleted file mode 100644
index 3be11a3de..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete010.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png
deleted file mode 100644
index 19a7b33a9..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete011.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png
deleted file mode 100644
index 181c3c776..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete012.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png
deleted file mode 100644
index 41205b572..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete013.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png
deleted file mode 100644
index c7a3c013d..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete014.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png
deleted file mode 100644
index dc113eac5..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete015.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png
deleted file mode 100644
index d6d6de45c..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete016.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png
deleted file mode 100644
index 74938a7e5..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete017.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png
deleted file mode 100644
index 9138b2860..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete018.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png
deleted file mode 100644
index 11bb359f2..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete019.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png b/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png
deleted file mode 100644
index a113e35cf..000000000
Binary files a/retroshare-gui/src/gui/images/emoticons/kopete/kopete020.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/encrypted16.png b/retroshare-gui/src/gui/images/encrypted16.png
deleted file mode 100644
index b2619730c..000000000
Binary files a/retroshare-gui/src/gui/images/encrypted16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/encrypted22.png b/retroshare-gui/src/gui/images/encrypted22.png
deleted file mode 100644
index 1cf62bf68..000000000
Binary files a/retroshare-gui/src/gui/images/encrypted22.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/encrypted32.png b/retroshare-gui/src/gui/images/encrypted32.png
deleted file mode 100644
index 974cd6816..000000000
Binary files a/retroshare-gui/src/gui/images/encrypted32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/encrypted48.png b/retroshare-gui/src/gui/images/encrypted48.png
deleted file mode 100644
index b09df126a..000000000
Binary files a/retroshare-gui/src/gui/images/encrypted48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/evolution.png b/retroshare-gui/src/gui/images/evolution.png
deleted file mode 100644
index a54a36647..000000000
Binary files a/retroshare-gui/src/gui/images/evolution.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/exit_24x24.png b/retroshare-gui/src/gui/images/exit_24x24.png
deleted file mode 100644
index 3f77be3e0..000000000
Binary files a/retroshare-gui/src/gui/images/exit_24x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/exit_32.png b/retroshare-gui/src/gui/images/exit_32.png
deleted file mode 100644
index 609d4d8ab..000000000
Binary files a/retroshare-gui/src/gui/images/exit_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/exportpeers_16x16.png b/retroshare-gui/src/gui/images/exportpeers_16x16.png
deleted file mode 100644
index c3bd700ba..000000000
Binary files a/retroshare-gui/src/gui/images/exportpeers_16x16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder.png b/retroshare-gui/src/gui/images/folder.png
deleted file mode 100644
index 66704bdf3..000000000
Binary files a/retroshare-gui/src/gui/images/folder.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder_blueshared.png b/retroshare-gui/src/gui/images/folder_blueshared.png
deleted file mode 100755
index 55c67b931..000000000
Binary files a/retroshare-gui/src/gui/images/folder_blueshared.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder_doments.png b/retroshare-gui/src/gui/images/folder_doments.png
deleted file mode 100644
index 8a6f1eff7..000000000
Binary files a/retroshare-gui/src/gui/images/folder_doments.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder_music.png b/retroshare-gui/src/gui/images/folder_music.png
deleted file mode 100755
index 32a6c5134..000000000
Binary files a/retroshare-gui/src/gui/images/folder_music.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder_open.png b/retroshare-gui/src/gui/images/folder_open.png
deleted file mode 100644
index 723b13b1c..000000000
Binary files a/retroshare-gui/src/gui/images/folder_open.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder_video.png b/retroshare-gui/src/gui/images/folder_video.png
deleted file mode 100755
index 0e45d0cb9..000000000
Binary files a/retroshare-gui/src/gui/images/folder_video.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/forums_new.png b/retroshare-gui/src/gui/images/forums_new.png
deleted file mode 100644
index c3410d99a..000000000
Binary files a/retroshare-gui/src/gui/images/forums_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/friendsfolder24.png b/retroshare-gui/src/gui/images/friendsfolder24.png
deleted file mode 100644
index 107e8e70b..000000000
Binary files a/retroshare-gui/src/gui/images/friendsfolder24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/genbackground.png b/retroshare-gui/src/gui/images/genbackground.png
deleted file mode 100644
index 24ab3725d..000000000
Binary files a/retroshare-gui/src/gui/images/genbackground.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/groupchat.png b/retroshare-gui/src/gui/images/groupchat.png
deleted file mode 100644
index 558f316bd..000000000
Binary files a/retroshare-gui/src/gui/images/groupchat.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/headerFrame.png b/retroshare-gui/src/gui/images/headerFrame.png
deleted file mode 100644
index 94f6acfcf..000000000
Binary files a/retroshare-gui/src/gui/images/headerFrame.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/help.png b/retroshare-gui/src/gui/images/help.png
deleted file mode 100644
index 9f0c92f23..000000000
Binary files a/retroshare-gui/src/gui/images/help.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/help24.png b/retroshare-gui/src/gui/images/help24.png
deleted file mode 100644
index 2c8279b6a..000000000
Binary files a/retroshare-gui/src/gui/images/help24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi128-app-ktorrent.png b/retroshare-gui/src/gui/images/hi128-app-ktorrent.png
deleted file mode 100644
index 764568d35..000000000
Binary files a/retroshare-gui/src/gui/images/hi128-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi16-app-ktorrent.png b/retroshare-gui/src/gui/images/hi16-app-ktorrent.png
deleted file mode 100644
index 6bdf51399..000000000
Binary files a/retroshare-gui/src/gui/images/hi16-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi24-app-ktorrent.png b/retroshare-gui/src/gui/images/hi24-app-ktorrent.png
deleted file mode 100644
index 052fb20bc..000000000
Binary files a/retroshare-gui/src/gui/images/hi24-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi32-app-ktorrent.png b/retroshare-gui/src/gui/images/hi32-app-ktorrent.png
deleted file mode 100644
index fe92c486e..000000000
Binary files a/retroshare-gui/src/gui/images/hi32-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi48-app-kblogger.png b/retroshare-gui/src/gui/images/hi48-app-kblogger.png
deleted file mode 100644
index da691264b..000000000
Binary files a/retroshare-gui/src/gui/images/hi48-app-kblogger.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi48-app-ktorrent.png b/retroshare-gui/src/gui/images/hi48-app-ktorrent.png
deleted file mode 100644
index 9afbadc6f..000000000
Binary files a/retroshare-gui/src/gui/images/hi48-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi64-app-kblogger.png b/retroshare-gui/src/gui/images/hi64-app-kblogger.png
deleted file mode 100644
index 2ae6d7ecb..000000000
Binary files a/retroshare-gui/src/gui/images/hi64-app-kblogger.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/hi64-app-ktorrent.png b/retroshare-gui/src/gui/images/hi64-app-ktorrent.png
deleted file mode 100644
index 47bbb7ee0..000000000
Binary files a/retroshare-gui/src/gui/images/hi64-app-ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identities_32.png b/retroshare-gui/src/gui/images/identity/identities_32.png
deleted file mode 100644
index 8bd056cfe..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identities_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identities_48.png b/retroshare-gui/src/gui/images/identity/identities_48.png
deleted file mode 100644
index e5322cfd0..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identities_48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identities_64.png b/retroshare-gui/src/gui/images/identity/identities_64.png
deleted file mode 100644
index 3fdc7ac39..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identities_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_32.png b/retroshare-gui/src/gui/images/identity/identity_32.png
deleted file mode 100644
index 9b6d2856d..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_48.png b/retroshare-gui/src/gui/images/identity/identity_48.png
deleted file mode 100644
index 4b771f0bf..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_64.png b/retroshare-gui/src/gui/images/identity/identity_64.png
deleted file mode 100644
index ae8ce8e50..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_create_32.png b/retroshare-gui/src/gui/images/identity/identity_create_32.png
deleted file mode 100644
index ce2a3ad05..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_create_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_create_64.png b/retroshare-gui/src/gui/images/identity/identity_create_64.png
deleted file mode 100644
index 8fab656d5..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_create_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_delete_32.png b/retroshare-gui/src/gui/images/identity/identity_delete_32.png
deleted file mode 100644
index 8c1531ce3..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_delete_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_24.png b/retroshare-gui/src/gui/images/identity/identity_edit_24.png
deleted file mode 100644
index 47dcfce02..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_32.png b/retroshare-gui/src/gui/images/identity/identity_edit_32.png
deleted file mode 100644
index f9040dc07..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_48.png b/retroshare-gui/src/gui/images/identity/identity_edit_48.png
deleted file mode 100644
index 910bb6d55..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/identity/identity_edit_64.png b/retroshare-gui/src/gui/images/identity/identity_edit_64.png
deleted file mode 100644
index 0e14fea7e..000000000
Binary files a/retroshare-gui/src/gui/images/identity/identity_edit_64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/im-ban-kick-user.png b/retroshare-gui/src/gui/images/im-ban-kick-user.png
deleted file mode 100644
index 180582c0a..000000000
Binary files a/retroshare-gui/src/gui/images/im-ban-kick-user.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/im-ban-user.png b/retroshare-gui/src/gui/images/im-ban-user.png
deleted file mode 100644
index 37712914a..000000000
Binary files a/retroshare-gui/src/gui/images/im-ban-user.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/im-invisible-user.png b/retroshare-gui/src/gui/images/im-invisible-user.png
deleted file mode 100644
index 15bdb5194..000000000
Binary files a/retroshare-gui/src/gui/images/im-invisible-user.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/im-kick-user.png b/retroshare-gui/src/gui/images/im-kick-user.png
deleted file mode 100644
index f9f0eec97..000000000
Binary files a/retroshare-gui/src/gui/images/im-kick-user.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/image16.png b/retroshare-gui/src/gui/images/image16.png
deleted file mode 100644
index b57e381d0..000000000
Binary files a/retroshare-gui/src/gui/images/image16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/irkickflash.png b/retroshare-gui/src/gui/images/irkickflash.png
deleted file mode 100644
index 0d67d3841..000000000
Binary files a/retroshare-gui/src/gui/images/irkickflash.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/kblogger.png b/retroshare-gui/src/gui/images/kblogger.png
deleted file mode 100644
index dca1970f8..000000000
Binary files a/retroshare-gui/src/gui/images/kblogger.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/kdmconfig.png b/retroshare-gui/src/gui/images/kdmconfig.png
deleted file mode 100644
index 688eb8491..000000000
Binary files a/retroshare-gui/src/gui/images/kdmconfig.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/knewsticker24.png b/retroshare-gui/src/gui/images/knewsticker24.png
deleted file mode 100644
index e15b73542..000000000
Binary files a/retroshare-gui/src/gui/images/knewsticker24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konsole.png b/retroshare-gui/src/gui/images/konsole.png
deleted file mode 100644
index b74026477..000000000
Binary files a/retroshare-gui/src/gui/images/konsole.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konv_message.png b/retroshare-gui/src/gui/images/konv_message.png
deleted file mode 100644
index b11381d2c..000000000
Binary files a/retroshare-gui/src/gui/images/konv_message.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konv_message2.png b/retroshare-gui/src/gui/images/konv_message2.png
deleted file mode 100644
index da0dba1e3..000000000
Binary files a/retroshare-gui/src/gui/images/konv_message2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konv_message3.png b/retroshare-gui/src/gui/images/konv_message3.png
deleted file mode 100644
index 40280bb50..000000000
Binary files a/retroshare-gui/src/gui/images/konv_message3.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konv_message64.png b/retroshare-gui/src/gui/images/konv_message64.png
deleted file mode 100644
index edecbfc42..000000000
Binary files a/retroshare-gui/src/gui/images/konv_message64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konversation.png b/retroshare-gui/src/gui/images/konversation.png
deleted file mode 100644
index 7b9299718..000000000
Binary files a/retroshare-gui/src/gui/images/konversation.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konversation128.png b/retroshare-gui/src/gui/images/konversation128.png
deleted file mode 100644
index 4398fd869..000000000
Binary files a/retroshare-gui/src/gui/images/konversation128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konversation16.png b/retroshare-gui/src/gui/images/konversation16.png
deleted file mode 100644
index 18565596d..000000000
Binary files a/retroshare-gui/src/gui/images/konversation16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/konversation64.png b/retroshare-gui/src/gui/images/konversation64.png
deleted file mode 100644
index 6d3a8e8e3..000000000
Binary files a/retroshare-gui/src/gui/images/konversation64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/ksysguard.png b/retroshare-gui/src/gui/images/ksysguard.png
deleted file mode 100644
index 10c196ebf..000000000
Binary files a/retroshare-gui/src/gui/images/ksysguard.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/ksysguard32.png b/retroshare-gui/src/gui/images/ksysguard32.png
deleted file mode 100755
index b30f71d2b..000000000
Binary files a/retroshare-gui/src/gui/images/ksysguard32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/ktorrent.png b/retroshare-gui/src/gui/images/ktorrent.png
deleted file mode 100644
index 740badb8c..000000000
Binary files a/retroshare-gui/src/gui/images/ktorrent.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/ktorrent32.png b/retroshare-gui/src/gui/images/ktorrent32.png
deleted file mode 100644
index fe92c486e..000000000
Binary files a/retroshare-gui/src/gui/images/ktorrent32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library.png b/retroshare-gui/src/gui/images/library.png
deleted file mode 100644
index a0465b33d..000000000
Binary files a/retroshare-gui/src/gui/images/library.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library16.png b/retroshare-gui/src/gui/images/library16.png
deleted file mode 100644
index ac24d7a74..000000000
Binary files a/retroshare-gui/src/gui/images/library16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library64.png b/retroshare-gui/src/gui/images/library64.png
deleted file mode 100644
index 8aec71cf2..000000000
Binary files a/retroshare-gui/src/gui/images/library64.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library_add.png b/retroshare-gui/src/gui/images/library_add.png
deleted file mode 100644
index 9285a9cdc..000000000
Binary files a/retroshare-gui/src/gui/images/library_add.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library_edit.png b/retroshare-gui/src/gui/images/library_edit.png
deleted file mode 100644
index 21906e920..000000000
Binary files a/retroshare-gui/src/gui/images/library_edit.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/library_view.png b/retroshare-gui/src/gui/images/library_view.png
deleted file mode 100644
index 86fe9a416..000000000
Binary files a/retroshare-gui/src/gui/images/library_view.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/loadcert16.png b/retroshare-gui/src/gui/images/loadcert16.png
deleted file mode 100644
index aa4f287b0..000000000
Binary files a/retroshare-gui/src/gui/images/loadcert16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png b/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png
deleted file mode 100644
index fa8257794..000000000
Binary files a/retroshare-gui/src/gui/images/logobar/logo_bar_fill.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logobar/logo_bar_start.png b/retroshare-gui/src/gui/images/logobar/logo_bar_start.png
deleted file mode 100644
index 9ebb7d1fe..000000000
Binary files a/retroshare-gui/src/gui/images/logobar/logo_bar_start.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logobar/rslogo.png b/retroshare-gui/src/gui/images/logobar/rslogo.png
deleted file mode 100644
index 18aaa95b2..000000000
Binary files a/retroshare-gui/src/gui/images/logobar/rslogo.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logobar/rslogo2.png b/retroshare-gui/src/gui/images/logobar/rslogo2.png
deleted file mode 100644
index 64266ed20..000000000
Binary files a/retroshare-gui/src/gui/images/logobar/rslogo2.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logobar/rslogoclean.png b/retroshare-gui/src/gui/images/logobar/rslogoclean.png
deleted file mode 100644
index 0ebb66fa9..000000000
Binary files a/retroshare-gui/src/gui/images/logobar/rslogoclean.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/lphoto.png b/retroshare-gui/src/gui/images/lphoto.png
deleted file mode 100644
index c7bb01c11..000000000
Binary files a/retroshare-gui/src/gui/images/lphoto.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/lphoto16.png b/retroshare-gui/src/gui/images/lphoto16.png
deleted file mode 100644
index f57102985..000000000
Binary files a/retroshare-gui/src/gui/images/lphoto16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/lphoto24.png b/retroshare-gui/src/gui/images/lphoto24.png
deleted file mode 100644
index 4eb197db1..000000000
Binary files a/retroshare-gui/src/gui/images/lphoto24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/message_new.png b/retroshare-gui/src/gui/images/message_new.png
deleted file mode 100644
index b1c9a4954..000000000
Binary files a/retroshare-gui/src/gui/images/message_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/messenger.png b/retroshare-gui/src/gui/images/messenger.png
deleted file mode 100644
index cf15aadc5..000000000
Binary files a/retroshare-gui/src/gui/images/messenger.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/my_documents_16.png b/retroshare-gui/src/gui/images/my_documents_16.png
deleted file mode 100644
index 571ad0851..000000000
Binary files a/retroshare-gui/src/gui/images/my_documents_16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/my_documents_22.png b/retroshare-gui/src/gui/images/my_documents_22.png
deleted file mode 100644
index 3afad57ab..000000000
Binary files a/retroshare-gui/src/gui/images/my_documents_22.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/my_documents_32.png b/retroshare-gui/src/gui/images/my_documents_32.png
deleted file mode 100644
index 7b7661d2c..000000000
Binary files a/retroshare-gui/src/gui/images/my_documents_32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/network.png b/retroshare-gui/src/gui/images/network.png
deleted file mode 100644
index 99a04417a..000000000
Binary files a/retroshare-gui/src/gui/images/network.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/network16.png b/retroshare-gui/src/gui/images/network16.png
deleted file mode 100644
index e1f1bd7cb..000000000
Binary files a/retroshare-gui/src/gui/images/network16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/network32.png b/retroshare-gui/src/gui/images/network32.png
deleted file mode 100644
index e74a67f44..000000000
Binary files a/retroshare-gui/src/gui/images/network32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png b/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png
deleted file mode 100644
index b79cd02dc..000000000
Binary files a/retroshare-gui/src/gui/images/newsfeed/news-feed-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png b/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png
deleted file mode 100644
index 4c0b74727..000000000
Binary files a/retroshare-gui/src/gui/images/newsfeed/news-feed-notify-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/newsfeed128.png b/retroshare-gui/src/gui/images/newsfeed128.png
deleted file mode 100644
index 19c256c9f..000000000
Binary files a/retroshare-gui/src/gui/images/newsfeed128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/newsfeed128_notify.png b/retroshare-gui/src/gui/images/newsfeed128_notify.png
deleted file mode 100644
index d660fe710..000000000
Binary files a/retroshare-gui/src/gui/images/newsfeed128_notify.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/retrotoolbar.png b/retroshare-gui/src/gui/images/retrotoolbar.png
deleted file mode 100644
index 4a8e6cd39..000000000
Binary files a/retroshare-gui/src/gui/images/retrotoolbar.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/rsmessenger16.png b/retroshare-gui/src/gui/images/rsmessenger16.png
deleted file mode 100644
index cdc8dd66c..000000000
Binary files a/retroshare-gui/src/gui/images/rsmessenger16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/rsmessenger32.png b/retroshare-gui/src/gui/images/rsmessenger32.png
deleted file mode 100644
index d768a5624..000000000
Binary files a/retroshare-gui/src/gui/images/rsmessenger32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/server_24x24.png b/retroshare-gui/src/gui/images/server_24x24.png
deleted file mode 100644
index fa4091150..000000000
Binary files a/retroshare-gui/src/gui/images/server_24x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/settings16.png b/retroshare-gui/src/gui/images/settings16.png
deleted file mode 100644
index 5f31eb45a..000000000
Binary files a/retroshare-gui/src/gui/images/settings16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/tags/anon.png b/retroshare-gui/src/gui/images/tags/anon.png
deleted file mode 100644
index eb90d1174..000000000
Binary files a/retroshare-gui/src/gui/images/tags/anon.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/toaster/chat.png b/retroshare-gui/src/gui/images/toaster/chat.png
deleted file mode 100644
index 1dd453348..000000000
Binary files a/retroshare-gui/src/gui/images/toaster/chat.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/toaster/hangup.png b/retroshare-gui/src/gui/images/toaster/hangup.png
deleted file mode 100644
index 2febc25be..000000000
Binary files a/retroshare-gui/src/gui/images/toaster/hangup.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/toaster/pickup.png b/retroshare-gui/src/gui/images/toaster/pickup.png
deleted file mode 100644
index 9da541978..000000000
Binary files a/retroshare-gui/src/gui/images/toaster/pickup.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/transfers_new.png b/retroshare-gui/src/gui/images/transfers_new.png
deleted file mode 100644
index 81e95b743..000000000
Binary files a/retroshare-gui/src/gui/images/transfers_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/trustsettings.png b/retroshare-gui/src/gui/images/trustsettings.png
deleted file mode 100644
index e7386a10c..000000000
Binary files a/retroshare-gui/src/gui/images/trustsettings.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/turtle.png b/retroshare-gui/src/gui/images/turtle.png
deleted file mode 100644
index 84ece2205..000000000
Binary files a/retroshare-gui/src/gui/images/turtle.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/typing.png b/retroshare-gui/src/gui/images/typing.png
deleted file mode 100644
index 28580e9a6..000000000
Binary files a/retroshare-gui/src/gui/images/typing.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/update.png b/retroshare-gui/src/gui/images/update.png
new file mode 100644
index 000000000..cdbd86b4b
Binary files /dev/null and b/retroshare-gui/src/gui/images/update.png differ
diff --git a/retroshare-gui/src/gui/images/view-certificate-copy-32.png b/retroshare-gui/src/gui/images/view-certificate-copy-32.png
deleted file mode 100644
index c5bea2449..000000000
Binary files a/retroshare-gui/src/gui/images/view-certificate-copy-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view-certificate-export-32.png b/retroshare-gui/src/gui/images/view-certificate-export-32.png
deleted file mode 100644
index f4075b9d6..000000000
Binary files a/retroshare-gui/src/gui/images/view-certificate-export-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view-certificate-sign-32.png b/retroshare-gui/src/gui/images/view-certificate-sign-32.png
deleted file mode 100644
index 1ea763f14..000000000
Binary files a/retroshare-gui/src/gui/images/view-certificate-sign-32.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/view-certificate-sign-48.png b/retroshare-gui/src/gui/images/view-certificate-sign-48.png
deleted file mode 100644
index 012e8aea8..000000000
Binary files a/retroshare-gui/src/gui/images/view-certificate-sign-48.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/vote_down.png b/retroshare-gui/src/gui/images/vote_down.png
deleted file mode 100644
index 369abdbda..000000000
Binary files a/retroshare-gui/src/gui/images/vote_down.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/vote_neutral.png b/retroshare-gui/src/gui/images/vote_neutral.png
deleted file mode 100644
index a68a43d75..000000000
Binary files a/retroshare-gui/src/gui/images/vote_neutral.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/vote_up.png b/retroshare-gui/src/gui/images/vote_up.png
deleted file mode 100644
index 9148aee7c..000000000
Binary files a/retroshare-gui/src/gui/images/vote_up.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 441b02bbc..2d794a8c7 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -173,7 +173,7 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in
 		{
 		case COLUMN_THREAD_STAR:         return QIcon(IMAGE_STAR_ON);
 		case COLUMN_THREAD_READ:         return QIcon(":/images/message-state-header.png");
-		case COLUMN_THREAD_ATTACHMENT:   return QIcon(":/images/attachment.png");
+		case COLUMN_THREAD_ATTACHMENT:   return QIcon(":/icons/png/attachements.png");
 		default:
 			return QVariant();
 		}
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp
index eca3c6c55..cf5c6a2b5 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp
@@ -37,7 +37,7 @@
 
 #include <time.h>
 
-#define IMAGE_EXPORT         ":/images/exportpeers_16x16.png"
+#define IMAGE_EXPORT         ""
 
 #define COLUMN_NAME			0
 #define COLUMN_EMAIL		1
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 794c2aa8a..b1ced689a 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -270,39 +270,6 @@ PluginItem > QFrame#frame {
 }
 */
 
-/* SearchDialog */
-
-SearchDialog QFrame#searchLineFrame[valid=false] {
-	border: 2px solid #079E00;
-	background-color: #DBDBDB;
-}
-
-SearchDialog QFrame#searchLineFrame[valid=true] {
-	border: 2px solid #079E00;
-	background-color: white;
-}
-
-SearchDialog QPushButton#pushButtonSearch { 
-	border-image: url(:/images/btn1.png) 4;
-	border-width: 4;
-	padding: 0px 6px;
-	font-size: 12px;
-	color: black;
-}
-
-SearchDialog QPushButton#pushButtonSearch:hover {
-	border-image: url(:/images/btn2.png) 4;
-}
-
-SearchDialog QPushButton#pushButtonSearch:pressed {
-	border-image: url(:/images/btn3.png) 4;
-}
-
-SearchDialog QFrame#searchLineFrame > QLineEdit {
-	background: transparent;
-	border: none;
-}
-
 /* GetStartedDialog */
 
 GetStartedDialog QTextEdit {
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index a17aa57d4..d28909220 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -38,8 +38,8 @@
 #include <retroshare/rsmsgs.h>
 
 #define VARIANT_STANDARD    "Standard"
-#define IMAGE_CHAT_CREATE   ":/images/add_24x24.png"
-#define IMAGE_CHAT_OPEN     ":/images/typing.png"
+#define IMAGE_CHAT_CREATE   ":/icons/png/add.png"
+#define IMAGE_CHAT_OPEN     ":/icons/png/typing.png"
 #define IMAGE_CHAT_DELETE   ":/images/deletemail24.png"
 #define IMAGE_CHAT_COPY     ":/images/copyrslink.png"
 
diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp
index 72f4b0eaf..e6e5f67e3 100755
--- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp
+++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp
@@ -60,7 +60,7 @@ FileAssociationsPage::FileAssociationsPage(QWidget * parent, Qt::WindowFlags fla
     QVBoxLayout* pageLay = new QVBoxLayout(this);
 
     toolBar = new QToolBar("actions", this);
-    newAction = new QAction(QIcon(":/images/add_24x24.png"), tr("&New"), this);
+    newAction = new QAction(QIcon(":/icons/png/add.png"), tr("&New"), this);
     //newAction->setShortcut(tr("Ctrl+N"));
     newAction->setStatusTip(tr("Add new Association"));
     connect(newAction, SIGNAL(triggered()), this, SLOT(addnew()));
diff --git a/retroshare-gui/src/gui/style/StyleDialog.cpp b/retroshare-gui/src/gui/style/StyleDialog.cpp
index 8ccae9edc..31e33c730 100644
--- a/retroshare-gui/src/gui/style/StyleDialog.cpp
+++ b/retroshare-gui/src/gui/style/StyleDialog.cpp
@@ -32,7 +32,7 @@ StyleDialog::StyleDialog(RSStyle &style, QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/library.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png"));
 	ui.headerFrame->setHeaderText(tr("Define Style"));
 
 	/* Load window postion */
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 9a16582e3..2238b4962 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -49,19 +49,15 @@
 /* Images for toolbar icons */
 #define IMAGE_RETROSHARE        ":/images/RetroShare16.png"
 #define IMAGE_ABOUT             ":/images/informations_24x24.png"
-#define IMAGE_STATISTIC         ":/images/ksysguard32.png"
 #define IMAGE_GAMES             ":/images/kgames.png"
 #define IMAGE_PHOTO             ":/images/lphoto.png"
 #define IMAGE_BWGRAPH           ":/images/ksysguard.png"
 #define IMAGE_CLOSE             ":/images/close_normal.png"
 #define IMAGE_CALENDAR          ":/images/calendar.png"
-#define IMAGE_LIBRARY           ":/images/library.png"
+#define IMAGE_LIBRARY           ":/icons/collections.png"
 #define IMAGE_PLUGINS           ":/images/extension_32.png"
-#define IMAGE_GXSFORUMS         ":/images/konversation.png"
 #define IMAGE_WIKI              ":/images/wikibook_32.png"
 #define IMAGE_POSTED            ":/images/posted_32.png"
-#define IMAGE_GXSCHANNELS       ":/images/channels.png"
-#define IMAGE_IDENTITY          ":/images/identity/identities_32.png"
 #define IMAGE_CIRCLES           ":/images/user/agt_forum24.png"
 
 
@@ -94,7 +90,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
 #if 0
     IdDialog *idDialog = NULL;
     ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
-                      action = createPageAction(QIcon(IMAGE_IDENTITY), tr("Identities"), grp));
+                      action = createPageAction(QIcon(), tr("Identities"), grp));
 
 #ifdef RS_USE_CIRCLES
     CirclesDialog *circlesDialog = NULL;
@@ -121,17 +117,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
     ui.stackPages->add(wikiDialog = new WikiDialog(ui.stackPages),
                       action = createPageAction(QIcon(IMAGE_WIKI), tr("Wiki Pages"), grp));
     mNotify.push_back(QPair<MainPage*, QAction*>(wikiDialog, action));*/
-#if 0
-    GxsForumsDialog *gxsforumsDialog = NULL;
-    ui.stackPages->add(gxsforumsDialog = new GxsForumsDialog(ui.stackPages),
-                      action = createPageAction(QIcon(IMAGE_GXSFORUMS), tr("GxsForums"), grp));
-    mNotify.push_back(QPair<MainPage*, QAction*>(gxsforumsDialog, action));
-
-    ChannelDialog *gxschannelDialog = NULL;
-    ui.stackPages->add(gxschannelDialog = new ChannelDialog(ui.stackPages),
-                      action = createPageAction(QIcon(IMAGE_GXSCHANNELS), tr("GxsChannels"), grp));
-    gxschannelDialog->setup();
-#endif
 
 // THESE HAVE TO BE CONVERTED TO VEG FORMAT
 #if USE_VEG_SERVICE
diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
index 1cef2f28b..e263f75e9 100644
--- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
@@ -41,7 +41,6 @@
 
 /* Images for context menu icons */
 #define IMAGE_REMOVEFRIEND       ":/images/removefriend16.png"
-#define IMAGE_EXPIORTFRIEND      ":/images/exportpeers_16x16.png"
 #define IMAGE_CHAT               ":/images/chat.png"
 /* Images for Status icons */
 #define IMAGE_ONLINE             ":/images/im-user.png"
@@ -93,7 +92,7 @@ void ExampleDialog::peertreeWidgetCostumPopupMenu( QPoint point )
       QMenu contextMnu( this );
       QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
 
-      voteupAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Vote Up" ), this );
+      voteupAct = new QAction(QIcon(), tr( "Vote Up" ), this );
       connect( voteupAct , SIGNAL( triggered() ), this, SLOT( voteup() ) );
 
       votedownAct = new QAction(QIcon(IMAGE_REMOVEFRIEND), tr( "Vote Down" ), this );
diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
index 7673d5c7e..9b9aee3a6 100644
--- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
@@ -53,7 +53,6 @@ const uint32_t GAME_PEER_ID = 4;
 
 /* Images for context menu icons */
 #define IMAGE_REMOVEFRIEND       ":/images/removefriend16.png"
-#define IMAGE_EXPIORTFRIEND      ":/images/exportpeers_16x16.png"
 #define IMAGE_CHAT               ":/images/chat.png"
 /* Images for Status icons */
 #define IMAGE_ONLINE             ":/images/im-user.png"
@@ -327,7 +326,7 @@ void GamesDialog::gameListPopupMenu( QPoint point )
       QMenu contextMnu( this );
       QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
 
-      QAction *deleteAct = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Cancel Game" ), this );
+      QAction *deleteAct = new QAction(QIcon(), tr( "Cancel Game" ), this );
       connect( deleteAct , SIGNAL( triggered() ), this, SLOT( deleteGame() ) );
 
       contextMnu.clear();
diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp
index 409073aba..ee4256d5e 100644
--- a/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.cpp
@@ -45,11 +45,9 @@
 #define IMAGE_DOWNLOAD       ":/images/download16.png"
 #define IMAGE_PLAY           ":/images/start.png"
 #define IMAGE_HASH_BUSY      ":/images/settings.png"
-#define IMAGE_HASH_DONE      ":/images/friendsfolder24.png"
 #define IMAGE_MSG            ":/images/message-mail.png"
-#define IMAGE_ATTACHMENT     ":/images/attachment.png"
+#define IMAGE_ATTACHMENT     ":/icons/png/attachements.png"
 #define IMAGE_FRIEND         ":/images/peers_16x16.png"
-#define IMAGE_PROGRESS       ":/images/browse-looking.gif"
 #define IMAGE_LIBRARY        ":/images/library.png"
 
 
diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
index 65c644a5d..f266a738c 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
@@ -42,12 +42,11 @@
 
 /* Images for context menu icons */
 #define IMAGE_REMOVEFRIEND       ":/images/removefriend16.png"
-#define IMAGE_EXPIORTFRIEND      ":/images/exportpeers_16x16.png"
 #define IMAGE_REMOVE             ":/images/cancel.png"
 #define IMAGE_CHAT               ":/images/chat.png"
 /* Images for Status icons */
 #define IMAGE_PEER               ":/images/user/identity16.png"
-#define IMAGE_PHOTOS              ":/images/image16.png"
+#define IMAGE_PHOTOS             ":/icons/png/photo.png"
 
 
 #define PHOTO_ICON_SIZE		90
@@ -135,7 +134,7 @@ void PhotoDialog::peerTreeWidgetCustomPopupMenu( QPoint point )
       QMenu contextMnu( this );
       QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
 
-      QAction *ins = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Insert Show Lists" ), this );
+      QAction *ins = new QAction(QIcon(), tr( "Insert Show Lists" ), this );
       connect( ins , SIGNAL( triggered() ), this, SLOT( insertShowLists() ) );
 
       contextMnu.clear();