diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index af5323d1d..22c9c2021 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -74,7 +74,6 @@
 #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"
 
 /*define viewType_CB value */
 #define VIEW_TYPE_TREE       0
@@ -228,7 +227,7 @@ SharedFilesDialog::SharedFilesDialog(RetroshareDirModel *_tree_model,RetroshareD
   sendlinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Send retroshare Links" ), this );
   connect( sendlinkAct , SIGNAL( triggered() ), this, SLOT( sendLinkTo( ) ) );
 
-  removeExtraFileAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Stop sharing this file" ), this );
+  removeExtraFileAct = new QAction(QIcon(), tr( "Stop sharing this file" ), this );
   connect( removeExtraFileAct , SIGNAL( triggered() ), this, SLOT( removeExtraFile() ) );
 
 	collCreateAct= new QAction(QIcon(IMAGE_COLLCREATE), tr("Create Collection..."), this) ;
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index d59b5bcf2..1e4382591 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -2106,7 +2106,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 			{
 				if(own_identities.size() <= 1)
 				{
-					QAction *action = contextMenu->addAction(QIcon(":/images/chat_24.png"), tr("Chat with this person"), this, SLOT(chatIdentity()));
+					QAction *action = contextMenu->addAction(QIcon(":/icons/png/chats.png"), tr("Chat with this person"), this, SLOT(chatIdentity()));
 
 					if(own_identities.empty())
 						action->setEnabled(false) ;
@@ -2115,7 +2115,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 				}
 				else
 				{
-					QMenu *mnu = contextMenu->addMenu(QIcon(":/images/chat_24.png"),tr("Chat with this person as...")) ;
+					QMenu *mnu = contextMenu->addMenu(QIcon(":/icons/png/chats.png"),tr("Chat with this person as...")) ;
 
 					for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
 					{
@@ -2132,18 +2132,17 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 					}
 				}
 			}
-
-			if (n_selected_items==1)
-				contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
-
 			// always allow to send messages
-			contextMenu->addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMsg()));
+			contextMenu->addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMsg()));
 
 			contextMenu->addSeparator();
 
 			if(n_is_a_contact == 0)
 				contextMenu->addAction(QIcon(), tr("Add to Contacts"), this, SLOT(addtoContacts()));
 
+			if (n_selected_items==1)
+				contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
+
 			if(n_is_not_a_contact == 0)
 				contextMenu->addAction(QIcon(":/images/cancel.png"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
 
@@ -2163,7 +2162,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 		{
 			contextMenu->addSeparator();
 
-			contextMenu->addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
+			contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
 			contextMenu->addAction(ui->editIdentity);
 			contextMenu->addAction(ui->removeIdentity);
 		}
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 06943cdb4..d66421243 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -142,8 +142,6 @@
 #define IMAGE_BWGRAPH           ":/icons/png/bandwidth.png"
 #define IMAGE_MESSENGER         ":/images/rsmessenger48.png"
 #define IMAGE_COLOR         	":/images/highlight.png"
-#define IMAGE_GAMES             ":/images/kgames.png"
-#define IMAGE_PHOTO             ":/images/lphoto.png"
 #define IMAGE_NEWRSCOLLECTION   ":/images/library.png"
 #define IMAGE_ADDSHARE          ":/images/directoryadd_24x24_shadow.png"
 #define IMAGE_OPTIONS           ":/images/settings.png"
diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index dd29dec14..5dc999740 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -48,11 +48,9 @@
 
 /* Images for context menu icons */
 #define IMAGE_PEERDETAILS    ":/images/info16.png"
-#define IMAGE_CLEAN_UNUSED   ":/images/deletemail24.png"
 #define IMAGE_MAKEFRIEND     ":/images/user/add_user16.png"
-#define IMAGE_EXPORT         ""
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
-#define IMAGE_MESSAGE         ":/images/mail_new.png"
+#define IMAGE_MESSAGE        ":/icons/mail/write-mail.png"
 
 /******
  * #define NET_DEBUG 1
@@ -130,11 +128,11 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
 		return ;
 
 	if(peer_id == rsPeers->getGPGOwnId())
-		contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated()));
+		contextMnu->addAction(QIcon(), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated()));
 
 	contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Profile details..."), this, SLOT(peerdetails()));
 	contextMnu->addSeparator() ;
-	contextMnu->addAction(QIcon(IMAGE_CLEAN_UNUSED), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys()));
+	contextMnu->addAction(QIcon(), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys()));
 
 	contextMnu->exec(QCursor::pos());
 }
diff --git a/retroshare-gui/src/gui/People/IdentityItem.cpp b/retroshare-gui/src/gui/People/IdentityItem.cpp
index 8ae3406c0..e1096d726 100644
--- a/retroshare-gui/src/gui/People/IdentityItem.cpp
+++ b/retroshare-gui/src/gui/People/IdentityItem.cpp
@@ -14,7 +14,7 @@
 #include "IdentityItem.h"
 
 #define IMAGE_MAKEFRIEND ":/images/user/add_user16.png"
-#define IMAGE_CHAT       ":/images/chat_24.png"
+#define IMAGE_CHAT       ":/icons/png/chats.png"
 
 IdentityItem *IdentityItem::_selected_node = NULL ;
 
diff --git a/retroshare-gui/src/gui/People/PeopleDialog.cpp b/retroshare-gui/src/gui/People/PeopleDialog.cpp
index ca7075c00..b90b2cfe9 100644
--- a/retroshare-gui/src/gui/People/PeopleDialog.cpp
+++ b/retroshare-gui/src/gui/People/PeopleDialog.cpp
@@ -458,7 +458,7 @@ void PeopleDialog::iw_AddButtonClickedExt()
 			}
 			else
 			{
-				QMenu *mnu = contextMnu.addMenu(QIcon(":/images/chat_24.png"),tr("Chat with this person as...")) ;
+				QMenu *mnu = contextMnu.addMenu(QIcon(":/icons/png/chats.png"),tr("Chat with this person as...")) ;
 
 				for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
 				{
@@ -475,15 +475,15 @@ void PeopleDialog::iw_AddButtonClickedExt()
 				}
 			}
 			
-			QAction *actionsendmsg = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMessage()));
+			QAction *actionsendmsg = contextMnu.addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMessage()));
 			actionsendmsg->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString()));
 			
-			QAction *actionsendinvite = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send invite"), this, SLOT(sendInvite()));
+			QAction *actionsendinvite = contextMnu.addAction(QIcon(":/icons/mail/write-mail.png"), tr("Send invite"), this, SLOT(sendInvite()));
 			actionsendinvite->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString()));
 			
 			contextMnu.addSeparator();
 			
-			QAction *actionaddcontact = contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Add to Contacts"), this, SLOT(addtoContacts()));
+			QAction *actionaddcontact = contextMnu.addAction(QIcon(""), tr("Add to Contacts"), this, SLOT(addtoContacts()));
 			actionaddcontact->setData( QString::fromStdString(dest->groupInfo().mMeta.mGroupId.toStdString()));
 			
 			contextMnu.addSeparator();
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui
index d06015f9b..c4a6d51cd 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui
@@ -223,8 +223,8 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/png/arrow-left.png</normaloff>:/icons/png/arrow-left.png</iconset>
         </property>
        </widget>
       </item>
@@ -244,8 +244,8 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/png/arrow-right.png</normaloff>:/icons/png/arrow-right.png</iconset>
         </property>
        </widget>
       </item>
@@ -512,7 +512,7 @@
             <string notr="true">&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textInteractionFlags">
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index e50823ffd..2433516a1 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -33,7 +33,7 @@
 
 #include "util/TokenQueue.h"
 
-#define IMAGE_WIRE              ":/images/kgames.png"
+#define IMAGE_WIRE              ":/icons/wire.png"
 
 class WireDialog : public MainPage, public TokenResponse, public PulseHolder
 {
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index 119d29a9f..edbdf0ca2 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -89,7 +89,7 @@ void WireGroupDialog::initUi()
 
 QPixmap WireGroupDialog::serviceImage()
 {
-	return QPixmap(":/images/wire_create_64.png");
+	return QPixmap(":/icons/wire-circle.png");
 }
 
 void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData &meta)
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
index f5ad5ea65..edc707eff 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.ui
@@ -231,8 +231,8 @@
              <string>&lt;&lt;</string>
             </property>
             <property name="icon">
-             <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/arrow-left.png</normaloff>:/images/arrow-left.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/arrow-left.png</normaloff>:/icons/png/arrow-left.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -260,8 +260,8 @@
              <string>&gt;&gt;</string>
             </property>
             <property name="icon">
-             <iconset resource="Wiki_images.qrc">
-              <normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/arrow-right.png</normaloff>:/icons/png/arrow-right.png</iconset>
             </property>
             <property name="iconSize">
              <size>
diff --git a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc
index fbd4e69d7..ec2c2118e 100644
--- a/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc
+++ b/retroshare-gui/src/gui/WikiPoos/Wiki_images.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>images/arrow-left.png</file>
-        <file>images/arrow-right.png</file>
         <file>images/addpage.png</file>
         <file>images/editpage.png</file>
         <file>images/reload.png</file>
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index d5bbc3d2b..21784401d 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -93,8 +93,8 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
     voteNegativeAct = new QAction(QIcon(":/icons/png/thumbs-down.png"), tr("Ban this person (Sets negative opinion)"), this);
     voteNeutralAct = new QAction(QIcon(":/icons/png/thumbs-neutral.png"), tr("Give neutral opinion"), this);
     votePositiveAct = new QAction(QIcon(":/icons/png/thumbs-up.png"), tr("Give positive opinion"), this);
-    distantChatAct = new QAction(QIcon(":/images/chat_24.png"), tr("Start private chat"), this);
-    sendMessageAct = new QAction(QIcon(":/images/mail_new.png"), tr("Send Message"), this);
+    distantChatAct = new QAction(QIcon(":/icons/png/chats.png"), tr("Start private chat"), this);
+    sendMessageAct = new QAction(QIcon(":/icons/mail/write-mail.png"), tr("Send Message"), this);
     showInPeopleAct = new QAction(QIcon(), tr("Show author in people tab"), this);
 
     QActionGroup *sortgrp = new QActionGroup(this);
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 49bd7ab56..c3cddc5dd 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -65,8 +65,8 @@
 #define IMAGE_EXPORTFRIEND       ":/images/user/friend_suggestion16.png"
 #define IMAGE_ADDFRIEND          ":/images/user/add_user16.png"
 #define IMAGE_FRIENDINFO         ":/images/info16.png"
-#define IMAGE_CHAT               ":/images/chat_24.png"
-#define IMAGE_MSG                ":/images/mail_new.png"
+#define IMAGE_CHAT               ":/icons/png/chats.png"
+#define IMAGE_MSG                ":/icons/mail/write-mail.png"
 #define IMAGE_CONNECT            ":/images/connect_friend.png"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUP16            ":/images/user/group16.png"
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 302ce9310..428479d84 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -63,8 +63,8 @@
 #define IMAGE_EXPORTFRIEND       ":/images/user/friend_suggestion16.png"
 #define IMAGE_ADDFRIEND          ":/images/user/add_user16.png"
 #define IMAGE_FRIENDINFO         ":/images/info16.png"
-#define IMAGE_CHAT               ":/images/chat_24.png"
-#define IMAGE_MSG                ":/images/mail_new.png"
+#define IMAGE_CHAT               ":/icons/png/chats.png"
+#define IMAGE_MSG                ":/icons/mail/write-mail.png"
 #define IMAGE_CONNECT            ":/images/connect_friend.png"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUP16            ":/images/user/group16.png"
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index 6111dfb45..b178da227 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -182,6 +182,19 @@ p, li { white-space: pre-wrap; }
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_2">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
             </layout>
            </item>
           </layout>
diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
index c9188d54b..89d8ec85c 100644
--- a/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>565</width>
+    <width>643</width>
     <height>209</height>
    </rect>
   </property>
@@ -171,8 +171,8 @@
             <string>Write a quick Message</string>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/message-mail.png</normaloff>:/images/message-mail.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/mail/write-mail.png</normaloff>:/icons/mail/write-mail.png</iconset>
            </property>
            <property name="checkable">
             <bool>false</bool>
@@ -203,8 +203,8 @@
             <string>Write Message</string>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/mail/write-mail.png</normaloff>:/icons/mail/write-mail.png</iconset>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -235,8 +235,8 @@
             <string>Start Chat</string>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/chat.png</normaloff>:/images/chat.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/png/chats.png</normaloff>:/icons/png/chats.png</iconset>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextBesideIcon</enum>
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index 8baa1c832..27c38211f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -159,8 +159,8 @@
               <string>Send Message</string>
              </property>
              <property name="icon">
-              <iconset resource="../images.qrc">
-               <normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
+              <iconset resource="../icons.qrc">
+               <normaloff>:/icons/mail/write-mail.png</normaloff>:/icons/mail/write-mail.png</iconset>
              </property>
              <property name="toolButtonStyle">
               <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -188,8 +188,8 @@
               <string>Start Chat</string>
              </property>
              <property name="icon">
-              <iconset resource="../images.qrc">
-               <normaloff>:/images/chat_24.png</normaloff>:/images/chat_24.png</iconset>
+              <iconset resource="../icons.qrc">
+               <normaloff>:/icons/png/chats.png</normaloff>:/icons/png/chats.png</iconset>
              </property>
              <property name="toolButtonStyle">
               <enum>Qt::ToolButtonTextBesideIcon</enum>
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 666d8fc27..65e07087f 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -984,6 +984,7 @@ void GxsGroupFrameDialog::insertGroupsData(const std::map<RsGxsGroupId,RsGroupMe
 
 	/* now we can add them in as a tree! */
 	ui->groupTreeWidget->fillGroupItems(mYourGroups, adminList);
+	mYourGroups->setText(2, QString::number(mYourGroups->childCount())); 
 	ui->groupTreeWidget->fillGroupItems(mSubscribedGroups, subList);
 	mSubscribedGroups->setText(2, QString::number(mSubscribedGroups->childCount())); // 1 COLUMN_UNREAD 2 COLUMN_POPULARITY
 	ui->groupTreeWidget->fillGroupItems(mPopularGroups, popList);
diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
index 230573f95..2db5d8534 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
@@ -285,7 +285,7 @@ void GxsIdChooser::loadPrivateIds()
 			QString str = tr("Create new Identity");
 			QString id = "";
 
-			addItem(QIcon(":/images/identity/identity_create_32.png"), str, id);
+			addItem(QIcon(":/icons/png/add-identity.png"), str, id);
 			setItemData(count() - 1, QString("%1_%2").arg(TYPE_CREATE_ID).arg(str), ROLE_SORT);
 			setItemData(count() - 1, TYPE_CREATE_ID, ROLE_TYPE);
             
diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
index f9fcaca21..6c6977eca 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
@@ -249,13 +249,13 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 	if(id.isNull())
 	{
 		str = tr("[Notification]");
-		icon = QIcon(":/icons/logo_128.png");
+		icon = QIcon(":/icons/notification.png");
 	}
 	else if(! computeNameIconAndComment(id,str,icon,comment))
 		if(mReloadPeriod > 3)
 		{
 			str = tr("[Unknown]");
-			icon = QIcon();
+			icon = QIcon(":/icons/anonymous.png");
 		}
 		else
 		{
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index e449e685d..2e9ba897b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -165,13 +165,13 @@ QString GxsChannelDialog::icon(IconType type)
 	case ICON_NEW:
 		return ":/icons/png/add.png";
 	case ICON_YOUR_GROUP:
-		return ":/icons/png/channel.png";
+		return "";
 	case ICON_SUBSCRIBED_GROUP:
-		return ":/icons/png/channel-subscribed.png";
+		return "";
 	case ICON_POPULAR_GROUP:
-		return ":/icons/png/channel-popular.png";
+		return "";
 	case ICON_OTHER_GROUP:
-		return ":/icons/png/channel-other.png";
+		return "";
     case ICON_SEARCH:
         return ":/images/find.png";
 	case ICON_DEFAULT:
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 851f6fd16..5124cb177 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -348,7 +348,6 @@ QVariant RsGxsForumModel::headerData(int section, Qt::Orientation /*orientation*
 		case COLUMN_THREAD_TITLE:        return tr("Title");
 		case COLUMN_THREAD_DATE:         return tr("Date");
 		case COLUMN_THREAD_AUTHOR:       return tr("Author");
-		case COLUMN_THREAD_DISTRIBUTION: return tr("Distribution");
 		default:
 			return QVariant();
 		}
@@ -356,7 +355,7 @@ QVariant RsGxsForumModel::headerData(int section, Qt::Orientation /*orientation*
 	if(role == Qt::DecorationRole)
 		switch(section)
 		{
-		case COLUMN_THREAD_DISTRIBUTION: return QIcon(":/icons/flag_green.png");
+		case COLUMN_THREAD_DISTRIBUTION: return QIcon(":/icons/flag-green.png");
 		case COLUMN_THREAD_READ:         return QIcon(":/images/message-state-read.png");
 		default:
 			return QVariant();
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index b071673b3..bf20e15a4 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -59,8 +59,9 @@
 //#define DEBUG_FORUMS
 
 /* Images for context menu icons */
-#define IMAGE_MESSAGE          ":/images/mail_new.png"
-#define IMAGE_MESSAGEREPLY     ":/images/mail_reply.png"
+#define IMAGE_MESSAGE          ":/icons/mail/compose.png"
+#define IMAGE_REPLY            ":/icons/mail/reply.png"
+#define IMAGE_MESSAGEREPLY     ":/icons/mail/write-mail.png"
 #define IMAGE_MESSAGEEDIT      ":/images/edit_16.png"
 #define IMAGE_MESSAGEREMOVE    ":/images/mail_delete.png"
 #define IMAGE_DOWNLOAD         ":/images/start.png"
@@ -580,7 +581,7 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/)
 	QAction *pinUpPostAct = new QAction(QIcon(IMAGE_PINPOST), (is_pinned?tr("Un-pin this post"):tr("Pin this post up")), &contextMnu);
 	connect(pinUpPostAct , SIGNAL(triggered()), this, SLOT(togglePinUpPost()));
 
-	QAction *replyAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply"), &contextMnu);
+	QAction *replyAct = new QAction(QIcon(IMAGE_REPLY), tr("Reply"), &contextMnu);
 	connect(replyAct, SIGNAL(triggered()), this, SLOT(replytoforummessage()));
 
     QAction *replyauthorAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr("Reply to author with private message"), &contextMnu);
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index ee9b71c67..d4b59faac 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -95,7 +95,7 @@
             </property>
             <property name="icon">
              <iconset resource="../icons.qrc">
-              <normaloff>:/icons/png/add.png</normaloff>:/icons/png/add.png</iconset>
+              <normaloff>:/icons/mail/compose.png</normaloff>:/icons/mail/compose.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -264,7 +264,7 @@
            </property>
            <property name="icon">
             <iconset resource="../icons.qrc">
-             <normaloff>:/icons/global_switch_on_128.png</normaloff>:/icons/global_switch_on_128.png</iconset>
+             <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -289,8 +289,8 @@
             <string notr="true"/>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/replymailall24-hover.png</normaloff>:/images/replymailall24-hover.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/mail/reply.png</normaloff>:/icons/mail/reply.png</iconset>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonIconOnly</enum>
@@ -376,8 +376,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/png/arrow-left.png</normaloff>:/icons/png/arrow-left.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -417,8 +417,8 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/png/arrow-right.png</normaloff>:/icons/png/arrow-right.png</iconset>
            </property>
            <property name="autoRaise">
             <bool>true</bool>
@@ -471,8 +471,11 @@
             <string notr="true"/>
            </property>
            <property name="icon">
-            <iconset resource="../images.qrc">
-             <normaloff>:/images/start.png</normaloff>:/images/start.png</iconset>
+            <iconset resource="../icons.qrc">
+             <normaloff>:/icons/png/next-unread.png</normaloff>:/icons/png/next-unread.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -524,6 +527,16 @@
   </action>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>LineEditClear</class>
+   <extends>QLineEdit</extends>
+   <header>gui/common/LineEditClear.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSTextBrowser</class>
+   <extends>QTextBrowser</extends>
+   <header>gui/common/RSTextBrowser.h</header>
+  </customwidget>
   <customwidget>
    <class>SubscribeToolButton</class>
    <extends>QToolButton</extends>
@@ -534,16 +547,6 @@
    <extends>QLabel</extends>
    <header>gui/gxs/GxsIdLabel.h</header>
   </customwidget>
-  <customwidget>
-   <class>LineEditClear</class>
-   <extends>QLineEdit</extends>
-   <header location="global">gui/common/LineEditClear.h</header>
-  </customwidget>
-  <customwidget>
-   <class>RSTextBrowser</class>
-   <extends>QTextBrowser</extends>
-   <header>gui/common/RSTextBrowser.h</header>
-  </customwidget>
   <customwidget>
    <class>ElidedLabel</class>
    <extends>QLabel</extends>
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index f37d88736..e4c14ae83 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -151,13 +151,13 @@ QString GxsForumsDialog::icon(IconType type)
 	case ICON_NEW:
 		return ":/icons/png/add.png";
 	case ICON_YOUR_GROUP:
-		return ":/icons/png/feedreader.png";
+		return "";
 	case ICON_SUBSCRIBED_GROUP:
-		return ":/icons/png/feed-subscribed.png";
+		return "";
 	case ICON_POPULAR_GROUP:
-		return ":/icons/png/feed-popular.png";
+		return "";
 	case ICON_OTHER_GROUP:
-		return ":/icons/png/feed-other.png";
+		return "";
 	case ICON_SEARCH:
 		return ":/images/find.png";
 	case ICON_DEFAULT:
diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.ui b/retroshare-gui/src/gui/help/browser/helpbrowser.ui
index a3d739438..824ffcb80 100644
--- a/retroshare-gui/src/gui/help/browser/helpbrowser.ui
+++ b/retroshare-gui/src/gui/help/browser/helpbrowser.ui
@@ -14,7 +14,7 @@
    <string>RetroShare Help</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../images.qrc">
+   <iconset>
     <normaloff>:/images/help.png</normaloff>:/images/help.png</iconset>
   </property>
   <property name="autoFillBackground">
@@ -25,7 +25,16 @@
     <property name="spacing">
      <number>6</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>9</number>
+    </property>
+    <property name="topMargin">
+     <number>9</number>
+    </property>
+    <property name="rightMargin">
+     <number>9</number>
+    </property>
+    <property name="bottomMargin">
      <number>9</number>
     </property>
     <item>
@@ -58,7 +67,16 @@
        <enum>QFrame::Raised</enum>
       </property>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -69,7 +87,16 @@
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -171,7 +198,16 @@
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -238,7 +274,7 @@
          <string>RetroShare Help</string>
         </property>
         <property name="windowIcon">
-         <iconset resource="../../images.qrc">
+         <iconset>
           <normaloff>:/images/help.png</normaloff>:/images/help.png</iconset>
         </property>
         <attribute name="title">
@@ -248,7 +284,16 @@
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>6</number>
+         </property>
+         <property name="topMargin">
+          <number>6</number>
+         </property>
+         <property name="rightMargin">
+          <number>6</number>
+         </property>
+         <property name="bottomMargin">
           <number>6</number>
          </property>
          <item>
@@ -297,7 +342,16 @@
          <string>Search</string>
         </attribute>
         <layout class="QGridLayout">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>6</number>
+         </property>
+         <property name="topMargin">
+          <number>6</number>
+         </property>
+         <property name="rightMargin">
+          <number>6</number>
+         </property>
+         <property name="bottomMargin">
           <number>6</number>
          </property>
          <property name="spacing">
@@ -308,7 +362,16 @@
            <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -445,8 +508,8 @@
   </widget>
   <action name="actionBack">
    <property name="icon">
-    <iconset resource="../../images.qrc">
-     <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
+    <iconset resource="../../icons.qrc">
+     <normaloff>:/icons/png/arrow-left.png</normaloff>:/icons/png/arrow-left.png</iconset>
    </property>
    <property name="text">
     <string>Back</string>
@@ -460,8 +523,8 @@
   </action>
   <action name="actionForward">
    <property name="icon">
-    <iconset resource="../../images.qrc">
-     <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
+    <iconset resource="../../icons.qrc">
+     <normaloff>:/icons/png/arrow-right.png</normaloff>:/icons/png/arrow-right.png</iconset>
    </property>
    <property name="text">
     <string>Forward</string>
@@ -475,8 +538,8 @@
   </action>
   <action name="actionHome">
    <property name="icon">
-    <iconset resource="../../images.qrc">
-     <normaloff>:/images/gohome.png</normaloff>:/images/gohome.png</iconset>
+    <iconset resource="../../icons.qrc">
+     <normaloff>:/icons/png/home.png</normaloff>:/icons/png/home.png</iconset>
    </property>
    <property name="text">
     <string>Home</string>
@@ -514,8 +577,8 @@
   </action>
   <action name="actionClose">
    <property name="icon">
-    <iconset resource="../../images.qrc">
-     <normaloff>:/images/exit_24x24.png</normaloff>:/images/exit_24x24.png</iconset>
+    <iconset resource="../../icons.qrc">
+     <normaloff>:/icons/png/exit2.png</normaloff>:/icons/png/exit2.png</iconset>
    </property>
    <property name="text">
     <string>Close</string>
@@ -551,6 +614,7 @@
  </tabstops>
  <resources>
   <include location="../../images.qrc"/>
+  <include location="../../icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 53b572552..5a3696343 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -56,6 +56,7 @@
         <file>icons/question.png</file>
         <file>icons/plugins_128.png</file>
         <file>icons/png/add.png</file>
+        <file>icons/png/add-identity.png</file>
         <file>icons/png/anonymous.png</file>
         <file>icons/png/attach-image.png</file>
         <file>icons/png/attach.png</file>
@@ -73,9 +74,6 @@
         <file>icons/png/exit.png</file>
         <file>icons/png/feedreader-notify.png</file>
         <file>icons/png/feedreader.png</file>
-        <file>icons/png/feed-other.png</file>
-        <file>icons/png/feed-popular.png</file>
-        <file>icons/png/feed-subscribed.png</file>
         <file>icons/png/filesharing-notify.png</file>
         <file>icons/png/filesharing.png</file>
         <file>icons/png/font.png</file>
@@ -243,9 +241,6 @@
         <file>icons/yandex.png</file>
         <file>icons/png/markdown-mark.png</file>
         <file>icons/png/channel.png</file>
-        <file>icons/png/channel-other.png</file>
-        <file>icons/png/channel-popular.png</file>
-        <file>icons/png/channel-subscribed.png</file>
         <file>icons/png/circles-black.png</file>
         <file>icons/png/circles-gray.png</file>
         <file>icons/png/circles-notify.png</file>
@@ -299,6 +294,9 @@
         <file>icons/png/add-file.png</file>
         <file>icons/png/add-image.png</file>
         <file>icons/png/attachements.png</file>
+        <file>icons/png/arrow-right.png</file>
+        <file>icons/png/arrow-left.png</file>
+        <file>icons/png/next-unread.png</file>
         <file>icons/mail/compose.png</file>
         <file>icons/mail/delete.png</file>
         <file>icons/mail/tags.png</file>
@@ -311,6 +309,7 @@
         <file>icons/mail/reply.png</file>
         <file>icons/mail/reply-all.png</file>
         <file>icons/mail/attach24.png</file>
+        <file>icons/mail/write-mail.png</file>
         <file>icons/textedit/align.png</file>
         <file>icons/textedit/font-decrease.png</file>
         <file>icons/textedit/smile.png</file>
@@ -318,5 +317,8 @@
         <file>icons/textedit/code.png</file>
         <file>icons/fullscreen.png</file>
         <file>icons/fullscreen-exit.png</file>
+        <file>icons/notification.png</file>
+        <file>icons/wire.png</file>
+        <file>icons/wire-circle.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/mail/write-mail.png b/retroshare-gui/src/gui/icons/mail/write-mail.png
new file mode 100644
index 000000000..a64236d4f
Binary files /dev/null and b/retroshare-gui/src/gui/icons/mail/write-mail.png differ
diff --git a/retroshare-gui/src/gui/icons/notification.png b/retroshare-gui/src/gui/icons/notification.png
new file mode 100644
index 000000000..88f837051
Binary files /dev/null and b/retroshare-gui/src/gui/icons/notification.png differ
diff --git a/retroshare-gui/src/gui/icons/png/add-identity.png b/retroshare-gui/src/gui/icons/png/add-identity.png
new file mode 100644
index 000000000..7eaf0d5c5
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/add-identity.png differ
diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-left.png b/retroshare-gui/src/gui/icons/png/arrow-left.png
similarity index 100%
rename from retroshare-gui/src/gui/WikiPoos/images/arrow-left.png
rename to retroshare-gui/src/gui/icons/png/arrow-left.png
diff --git a/retroshare-gui/src/gui/WikiPoos/images/arrow-right.png b/retroshare-gui/src/gui/icons/png/arrow-right.png
similarity index 100%
rename from retroshare-gui/src/gui/WikiPoos/images/arrow-right.png
rename to retroshare-gui/src/gui/icons/png/arrow-right.png
diff --git a/retroshare-gui/src/gui/icons/png/next-unread.png b/retroshare-gui/src/gui/icons/png/next-unread.png
new file mode 100644
index 000000000..812a12d7d
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/next-unread.png differ
diff --git a/retroshare-gui/src/gui/icons/wire-circle.png b/retroshare-gui/src/gui/icons/wire-circle.png
new file mode 100644
index 000000000..128159150
Binary files /dev/null and b/retroshare-gui/src/gui/icons/wire-circle.png differ
diff --git a/retroshare-gui/src/gui/icons/wire.png b/retroshare-gui/src/gui/icons/wire.png
new file mode 100644
index 000000000..ed0c82334
Binary files /dev/null and b/retroshare-gui/src/gui/icons/wire.png differ
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 275998882..5676c0e7b 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -56,8 +56,6 @@
     <file>images/list_bullet_arrow.png</file>
     <file>images/rc_combined.png</file>
     <file>images/combobox_arrow.png</file>
-    <file>images/arrow-left.png</file>
-    <file>images/arrow-right.png</file>
     <file>help/authors.html</file>
     <file>help/licence.html</file>
     <file>help/thanks.html</file>
@@ -81,7 +79,6 @@
     <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/back.png</file>
     <file>images/configure.png</file>
     <file>images/copyrslink.png</file>
     <file>images/contacts24.png</file>
@@ -117,18 +114,14 @@
     <file>images/add-share24.png</file>
     <file>images/avatar_background.png</file>
     <file>images/button_cancel.png</file>
-    <file>images/calendar.png</file>
     <file>images/chat.png</file>
     <file>images/chat_24.png</file>
     <file>images/cancel.png</file>
     <file>images/close-down.png</file>
     <file>images/close_normal.png</file>
-    <file>images/contact_new128.png</file>
     <file>images/copy.png</file>
     <file>images/delete.png</file>
     <file>images/deleteall.png</file>
-    <file>images/deletemail-pressed.png</file>
-    <file>images/deletemail24.png</file>
     <file>images/directoryadd_24x24_shadow.png</file>
     <file>images/directoryremove_24x24_shadow.png</file>
     <file>images/directoryselect_24x24_shadow.png</file>
@@ -197,15 +190,12 @@
     <file>images/folder-outbox.png</file>
     <file>images/folder-sent.png</file>
     <file>images/folder-trash.png</file>
-    <file>images/forward.png</file>
-    <file>images/kgames.png</file>
     <file>images/go-down.png</file>
     <file>images/go-top.png</file>
     <file>images/go-up.png</file>
     <file>images/go-bottom.png</file>
     <file>images/graph-area.png</file>
     <file>images/graph-line.png</file>
-    <file>images/gohome.png</file>
     <file>images/gpgp_key_generate.png</file>
     <file>images/hide_toolbox_frame.png</file>
     <file>images/hide_frame.png</file>
@@ -246,17 +236,8 @@
     <file>images/logo/logo_info.png</file>
     <file>images/logo/logo_splash.png</file>
     <file>images/logo/logo_web_nobackground.png</file>
-    <file>images/mail-message-new.png</file>
     <file>images/mail-signed.png</file>
     <file>images/mail-signature-unknown.png</file>
-    <file>images/mail_delete.png</file>
-    <file>images/mail_get.png</file>
-    <file>images/mail_reply.png</file>
-    <file>images/mail_replyall.png</file>
-    <file>images/mail_forward.png</file>
-    <file>images/mail_send.png</file>
-    <file>images/mail_new.png</file>
-    <file>images/mail_send24.png</file>
     <file>images/mailforward24-hover.png</file>
     <file>images/message-mail.png</file>
     <file>images/message-mail-read.png</file>
@@ -276,7 +257,6 @@
     <file>images/mute-off-16.png</file>
     <file>images/mute-on-16.png</file>
     <file>images/new-mail-alert.png</file>
-    <file>images/new_forum16.png</file>
     <file>images/newmsg.png</file>
     <file>images/no_avatar_70.png</file>
     <file>images/no_avatar_background.png</file>
diff --git a/retroshare-gui/src/gui/images/arrow-left.png b/retroshare-gui/src/gui/images/arrow-left.png
deleted file mode 100644
index 6a29679ae..000000000
Binary files a/retroshare-gui/src/gui/images/arrow-left.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/arrow-right.png b/retroshare-gui/src/gui/images/arrow-right.png
deleted file mode 100644
index 207f7fcf2..000000000
Binary files a/retroshare-gui/src/gui/images/arrow-right.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/back.png b/retroshare-gui/src/gui/images/back.png
deleted file mode 100644
index 78dcc7011..000000000
Binary files a/retroshare-gui/src/gui/images/back.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/calendar.png b/retroshare-gui/src/gui/images/calendar.png
deleted file mode 100644
index e91b13d73..000000000
Binary files a/retroshare-gui/src/gui/images/calendar.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contact_new128.png b/retroshare-gui/src/gui/images/contact_new128.png
deleted file mode 100644
index ff60d9b48..000000000
Binary files a/retroshare-gui/src/gui/images/contact_new128.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/deletemail-pressed.png b/retroshare-gui/src/gui/images/deletemail-pressed.png
deleted file mode 100644
index 8d79b7e61..000000000
Binary files a/retroshare-gui/src/gui/images/deletemail-pressed.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/deletemail24.png b/retroshare-gui/src/gui/images/deletemail24.png
deleted file mode 100644
index b584ead3f..000000000
Binary files a/retroshare-gui/src/gui/images/deletemail24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/forward.png b/retroshare-gui/src/gui/images/forward.png
deleted file mode 100644
index a7d90d558..000000000
Binary files a/retroshare-gui/src/gui/images/forward.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/gohome.png b/retroshare-gui/src/gui/images/gohome.png
deleted file mode 100644
index 6c45397e4..000000000
Binary files a/retroshare-gui/src/gui/images/gohome.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/help/addafriend.png b/retroshare-gui/src/gui/images/help/addafriend.png
index 6f37763b3..af52a79e5 100644
Binary files a/retroshare-gui/src/gui/images/help/addafriend.png and b/retroshare-gui/src/gui/images/help/addafriend.png differ
diff --git a/retroshare-gui/src/gui/images/help/addfriendkey.png b/retroshare-gui/src/gui/images/help/addfriendkey.png
index 55e9535f0..c9cb06011 100644
Binary files a/retroshare-gui/src/gui/images/help/addfriendkey.png and b/retroshare-gui/src/gui/images/help/addfriendkey.png differ
diff --git a/retroshare-gui/src/gui/images/kgames.png b/retroshare-gui/src/gui/images/kgames.png
deleted file mode 100644
index 2ec077b76..000000000
Binary files a/retroshare-gui/src/gui/images/kgames.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail-message-new.png b/retroshare-gui/src/gui/images/mail-message-new.png
deleted file mode 100644
index 5754fdf7b..000000000
Binary files a/retroshare-gui/src/gui/images/mail-message-new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_delete.png b/retroshare-gui/src/gui/images/mail_delete.png
deleted file mode 100644
index dc9c020f7..000000000
Binary files a/retroshare-gui/src/gui/images/mail_delete.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_forward.png b/retroshare-gui/src/gui/images/mail_forward.png
deleted file mode 100755
index 833360b24..000000000
Binary files a/retroshare-gui/src/gui/images/mail_forward.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_get.png b/retroshare-gui/src/gui/images/mail_get.png
deleted file mode 100644
index a8fc27a5c..000000000
Binary files a/retroshare-gui/src/gui/images/mail_get.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_new.png b/retroshare-gui/src/gui/images/mail_new.png
deleted file mode 100644
index 55bba1bdd..000000000
Binary files a/retroshare-gui/src/gui/images/mail_new.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_reply.png b/retroshare-gui/src/gui/images/mail_reply.png
deleted file mode 100644
index 471a08ebf..000000000
Binary files a/retroshare-gui/src/gui/images/mail_reply.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_replyall.png b/retroshare-gui/src/gui/images/mail_replyall.png
deleted file mode 100755
index 6e738a11e..000000000
Binary files a/retroshare-gui/src/gui/images/mail_replyall.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_send.png b/retroshare-gui/src/gui/images/mail_send.png
deleted file mode 100644
index 0366228e9..000000000
Binary files a/retroshare-gui/src/gui/images/mail_send.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/mail_send24.png b/retroshare-gui/src/gui/images/mail_send24.png
deleted file mode 100644
index be6d64f00..000000000
Binary files a/retroshare-gui/src/gui/images/mail_send24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/new_forum16.png b/retroshare-gui/src/gui/images/new_forum16.png
deleted file mode 100644
index 712802dde..000000000
Binary files a/retroshare-gui/src/gui/images/new_forum16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 902c364b3..6fc76ed79 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -60,6 +60,7 @@
 #define IMAGE_SYSTEM           ":/images/user/user_request16.png"
 #define IMAGE_DECRYPTMESSAGE   ":/images/decrypt-mail.png"
 #define IMAGE_AUTHOR_INFO      ":/images/info16.png"
+#define IMAGE_NOTFICATION      ":/icons/notification.png"
 
 #define IMAGE_INBOX             ":/images/folder-inbox.png"
 #define IMAGE_OUTBOX            ":/images/folder-outbox.png"
@@ -420,7 +421,7 @@ void MessagesDialog::fillQuickView()
 	}
 
 	item = new QListWidgetItem(tr("System"), ui.quickViewWidget);
-	item->setIcon(QIcon(IMAGE_SYSTEM));
+	item->setIcon(QIcon(IMAGE_NOTFICATION));
 	item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
 	item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_SYSTEM);
 	item->setData(ROLE_QUICKVIEW_TEXT, item->text()); // for updateMessageSummaryList
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
index a68c56668..2c5568bcc 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
@@ -25,12 +25,6 @@
    </property>
    <item>
     <widget class="RSTabWidget" name="tabWidget">
-     <property name="iconSize">
-      <size>
-       <width>24</width>
-       <height>24</height>
-      </size>
-     </property>
      <property name="tabsClosable">
       <bool>true</bool>
      </property>
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp
index cf5c6a2b5..0a8a80df6 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp
@@ -50,7 +50,7 @@ ProfileManager::ProfileManager(QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/profile.png"));
 	ui.headerFrame->setHeaderText(tr("Profile Manager"));
 
 	connect(ui.identityTreeWidget, SIGNAL( customContextMenuRequested(QPoint)), this, SLOT( identityTreeWidgetCostumPopupMenu(QPoint)));
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui
index b5a49cff2..9ec918e89 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.ui
+++ b/retroshare-gui/src/gui/profile/ProfileManager.ui
@@ -134,7 +134,7 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 088205ec3..6fa73f661 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -860,3 +860,8 @@ PostedCreatePostDialog QPushButton#submitButton:hover {
 	min-width: 4em;
 	padding: 2px;
 }
+
+MessageWidget QTextBrowser#toText , QTextBrowser#ccText , QTextBrowser#bccText {
+	background: transparent;
+	border: none;
+}
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 2238b4962..9db4326a4 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -49,11 +49,7 @@
 /* Images for toolbar icons */
 #define IMAGE_RETROSHARE        ":/images/RetroShare16.png"
 #define IMAGE_ABOUT             ":/images/informations_24x24.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           ":/icons/collections.png"
 #define IMAGE_PLUGINS           ":/images/extension_32.png"
 #define IMAGE_WIKI              ":/images/wikibook_32.png"
@@ -82,11 +78,11 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
 
     //GamesDialog *gamesDialog = NULL;
     //ui.stackPages->add(gamesDialog = new GamesDialog(ui.stackPages),
-    //                   createPageAction(QIcon(IMAGE_GAMES), tr("Games Launcher"), grp));
+    //                   createPageAction(QIcon(), tr("Games Launcher"), grp));
 
     //CalDialog *calDialog = NULL;
     //ui.stackPages->add(calDialog = new CalDialog(ui.stackPages),
-    //                  createPageAction(QIcon(IMAGE_CALENDAR), tr("Shared Calendars"), grp));
+    //                  createPageAction(QIcon(), tr("Shared Calendars"), grp));
 #if 0
     IdDialog *idDialog = NULL;
     ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
@@ -103,7 +99,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
 #ifdef RS_USE_PHOTOSHARE
     PhotoShare *photoShare = NULL;
     ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
-                     action = createPageAction(QIcon(IMAGE_PHOTO), tr("Photos"), grp));
+                     action = createPageAction(QIcon(), tr("Photos"), grp));
     mNotify.push_back(QPair<MainPage*, QAction*>(photoShare, action));
 #endif
 
@@ -122,7 +118,7 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
 #if USE_VEG_SERVICE
     WireDialog *wireDialog = NULL;
     ui.stackPages->add(wireDialog = new WireDialog(ui.stackPages),
-                      action = createPageAction(QIcon(IMAGE_BWGRAPH), tr("The Wire"), grp));
+                      action = createPageAction(QIcon(), tr("The Wire"), grp));
     mNotify.push_back(QPair<MainPage*, QAction*>(wireDialog, action));
 #endif