diff --git a/retroshare-gui/src/gui/AboutDialog.cpp b/retroshare-gui/src/gui/AboutDialog.cpp
index bead7d321..6afee5b0a 100644
--- a/retroshare-gui/src/gui/AboutDialog.cpp
+++ b/retroshare-gui/src/gui/AboutDialog.cpp
@@ -177,7 +177,7 @@ void AboutDialog::on_help_button_clicked()
 AWidget::AWidget() {
     setMouseTracking(true);
 
-    QImage image(":/images/about.png");
+    QImage image(":/images/logo/logo_info.png");
     QPainter p(&image);
     p.setPen(Qt::black);
     QFont font = p.font();
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index fe0b26bbc..7276a8b04 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="margin">
@@ -149,6 +149,12 @@
            </item>
            <item>
             <widget class="QPushButton" name="importIdentity_PB">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
               <string>Import new identity</string>
              </property>
@@ -156,6 +162,12 @@
            </item>
            <item>
             <widget class="QPushButton" name="exportIdentity_PB">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
               <string>Export selected identity</string>
              </property>
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 6e29b6fa4..e30b1f750 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -148,9 +148,9 @@
 #define IMG_HELP                ":/images/help24.png"
 #define IMAGE_NEWSFEED          ":/images/newsfeed128.png"
 #define IMAGE_PLUGINS           ":/images/extension_32.png"
-#define IMAGE_NOONLINE          ":/images/rstray0.png"
-#define IMAGE_ONEONLINE         ":/images/rstray1.png"
-#define IMAGE_TWOONLINE         ":/images/rstray2.png"
+#define IMAGE_NOONLINE          ":/images/logo/logo_24_0.png"
+#define IMAGE_ONEONLINE         ":/images/logo/logo_24_1.png"
+#define IMAGE_TWOONLINE         ":/images/logo/logo_24_2.png"
 #define IMAGE_BLOGS             ":/images/kblogger.png"
 #define IMAGE_DHT               ":/images/dht16.png"
 #define IMAGE_CHATLOBBY			":/images/chat_32.png"
@@ -209,7 +209,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
     QDesktopServices::setUrlHandler("https", this, "externalLinkActivated");
 
     // Setting icons
-    this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
+    this->setWindowIcon(QIcon(QString::fromUtf8(":/images/logo/logo_16.png")));
 
     /* Create all the dialogs of which we only want one instance */
     _bandwidthGraph = new BandwidthGraph();
diff --git a/retroshare-gui/src/gui/MessengerWindow.ui b/retroshare-gui/src/gui/MessengerWindow.ui
index 368dd2164..7e16f7ea6 100644
--- a/retroshare-gui/src/gui/MessengerWindow.ui
+++ b/retroshare-gui/src/gui/MessengerWindow.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
@@ -142,7 +142,7 @@
      <x>0</x>
      <y>0</y>
      <width>258</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
   </widget>
diff --git a/retroshare-gui/src/gui/QuickStartWizard.ui b/retroshare-gui/src/gui/QuickStartWizard.ui
index caa80d3b7..2bd83d2a1 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.ui
+++ b/retroshare-gui/src/gui/QuickStartWizard.ui
@@ -30,7 +30,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <property name="modal">
    <bool>true</bool>
diff --git a/retroshare-gui/src/gui/RttStatistics.ui b/retroshare-gui/src/gui/RttStatistics.ui
index 3bcee25d8..fe4e21b7a 100644
--- a/retroshare-gui/src/gui/RttStatistics.ui
+++ b/retroshare-gui/src/gui/RttStatistics.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
@@ -38,8 +38,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>587</width>
-         <height>384</height>
+         <width>593</width>
+         <height>390</height>
         </rect>
        </property>
       </widget>
diff --git a/retroshare-gui/src/gui/ShareDialog.ui b/retroshare-gui/src/gui/ShareDialog.ui
index 6cce47b91..12780957c 100644
--- a/retroshare-gui/src/gui/ShareDialog.ui
+++ b/retroshare-gui/src/gui/ShareDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="margin">
diff --git a/retroshare-gui/src/gui/ShareManager.ui b/retroshare-gui/src/gui/ShareManager.ui
index e46411bef..7ef0ec270 100644
--- a/retroshare-gui/src/gui/ShareManager.ui
+++ b/retroshare-gui/src/gui/ShareManager.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="margin">
diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui
index ad7345d24..584c1425b 100644
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
diff --git a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui
index cf7b46fc8..1c3549f50 100644
--- a/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui
+++ b/retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <property name="margin">
diff --git a/retroshare-gui/src/gui/bwctrl/BwCtrlWindow.ui b/retroshare-gui/src/gui/bwctrl/BwCtrlWindow.ui
index e472d571f..b74c67347 100644
--- a/retroshare-gui/src/gui/bwctrl/BwCtrlWindow.ui
+++ b/retroshare-gui/src/gui/bwctrl/BwCtrlWindow.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/dht16.png</normaloff>:/images/dht16.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -104,7 +104,7 @@
      <x>0</x>
      <y>0</y>
      <width>525</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
   </widget>
diff --git a/retroshare-gui/src/gui/bwgraph/bwgraph.ui b/retroshare-gui/src/gui/bwgraph/bwgraph.ui
index 34e97a989..8f256a033 100644
--- a/retroshare-gui/src/gui/bwgraph/bwgraph.ui
+++ b/retroshare-gui/src/gui/bwgraph/bwgraph.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
index aeccf502b..e0ef65fd2 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
    <property name="horizontalSpacing">
@@ -964,6 +964,7 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index dacb5a3da..3cd5caaf6 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <widget class="ConnectFriendPage" name="IntroPage">
    <property name="title">
@@ -1076,6 +1076,7 @@
  <resources>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui
index bf043357c..c9129d8c5 100644
--- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
index aa19602a3..5c603cb93 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_8">
    <property name="margin">
@@ -293,7 +293,7 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>518</width>
+               <width>98</width>
                <height>24</height>
               </rect>
              </property>
@@ -381,6 +381,7 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
index 2ba243dc8..ea7ee521d 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -203,7 +203,7 @@
 &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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&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-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
              </widget>
             </item>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 67c1d3cfe..b75c8bb0f 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -323,6 +323,19 @@
         <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>
+        <file>images/logo/logo_24_1.png</file>
+        <file>images/logo/logo_24_2.png</file>
+        <file>images/logo/logo_32.png</file>
+        <file>images/logo/logo_48.png</file>
+        <file>images/logo/logo_64.png</file>
+        <file>images/logo/logo_128.png</file>
+        <file>images/logo/logo_256.png</file>
+        <file>images/logo/logo_512.png</file>
+        <file>images/logo/logo_info.png</file>
+        <file>images/logo/logo_splash.png</file>
         <file>images/logobar/logo_bar_fill.png</file>
         <file>images/logobar/logo_bar_start.png</file>
         <file>images/logobar/rslogo.png</file>
@@ -370,9 +383,6 @@
         <file>images/openimage.png</file>
         <file>images/pasterslink.png</file>
         <file>images/package_games1.png</file>
-        <file>images/peerdetails_16x16.png</file>
-        <file>images/peers_16x16.png</file>
-        <file>images/peers_24x24.png</file>
         <file>images/pin32.png</file>
         <file>images/print24.png</file>
         <file>images/priorityauto.png</file>
@@ -401,7 +411,6 @@
         <file>images/reload24.png</file>
         <file>images/reset.png</file>
         <file>images/resume.png</file>
-        <file>images/RetroShare16.png</file>
         <file>images/retrosharelogo1.png</file>
         <file>images/retrosharelogo2.png</file>
         <file>images/retrosharelogo32.png</file>
diff --git a/retroshare-gui/src/gui/images/RetroShare16.png b/retroshare-gui/src/gui/images/RetroShare16.png
deleted file mode 100644
index 60c7c5da5..000000000
Binary files a/retroshare-gui/src/gui/images/RetroShare16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_128.png b/retroshare-gui/src/gui/images/logo/logo_128.png
new file mode 100644
index 000000000..3116ac85f
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_128.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_16.png b/retroshare-gui/src/gui/images/logo/logo_16.png
new file mode 100644
index 000000000..e81c18b0e
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_16.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_24.png b/retroshare-gui/src/gui/images/logo/logo_24.png
new file mode 100644
index 000000000..e0aadaf29
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_24.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_24_0.png b/retroshare-gui/src/gui/images/logo/logo_24_0.png
new file mode 100644
index 000000000..f2d6b8936
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_24_0.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_24_1.png b/retroshare-gui/src/gui/images/logo/logo_24_1.png
new file mode 100644
index 000000000..874dc067d
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_24_1.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_24_2.png b/retroshare-gui/src/gui/images/logo/logo_24_2.png
new file mode 100644
index 000000000..25bdef79b
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_24_2.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_256.png b/retroshare-gui/src/gui/images/logo/logo_256.png
new file mode 100644
index 000000000..4bf2622f0
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_256.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_32.png b/retroshare-gui/src/gui/images/logo/logo_32.png
new file mode 100644
index 000000000..cb807a2fd
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_32.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_48.png b/retroshare-gui/src/gui/images/logo/logo_48.png
new file mode 100644
index 000000000..5ab85bbb7
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_48.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_512.png b/retroshare-gui/src/gui/images/logo/logo_512.png
new file mode 100644
index 000000000..031beb4a3
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_512.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_64.png b/retroshare-gui/src/gui/images/logo/logo_64.png
new file mode 100644
index 000000000..abef01ae5
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_64.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_info.png b/retroshare-gui/src/gui/images/logo/logo_info.png
new file mode 100644
index 000000000..0320034cd
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_info.png differ
diff --git a/retroshare-gui/src/gui/images/logo/logo_splash.png b/retroshare-gui/src/gui/images/logo/logo_splash.png
new file mode 100644
index 000000000..dc78d2b1e
Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/logo_splash.png differ
diff --git a/retroshare-gui/src/gui/images/peerdetails_16x16.png b/retroshare-gui/src/gui/images/peerdetails_16x16.png
deleted file mode 100644
index c3038709e..000000000
Binary files a/retroshare-gui/src/gui/images/peerdetails_16x16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/peers_16x16.png b/retroshare-gui/src/gui/images/peers_16x16.png
deleted file mode 100644
index a1d1bac82..000000000
Binary files a/retroshare-gui/src/gui/images/peers_16x16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/peers_24x24.png b/retroshare-gui/src/gui/images/peers_24x24.png
deleted file mode 100644
index f72aa562f..000000000
Binary files a/retroshare-gui/src/gui/images/peers_24x24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/rswinicon.ico b/retroshare-gui/src/gui/images/rswinicon.ico
deleted file mode 100644
index 9b319e658..000000000
Binary files a/retroshare-gui/src/gui/images/rswinicon.ico and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/tst.ico b/retroshare-gui/src/gui/images/tst.ico
deleted file mode 100644
index d0d18b00f..000000000
Binary files a/retroshare-gui/src/gui/images/tst.ico and /dev/null differ
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui
index 434f68cc3..59ba81557 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.ui
+++ b/retroshare-gui/src/gui/profile/ProfileManager.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="margin">
diff --git a/retroshare-gui/src/gui/profile/StatusMessage.ui b/retroshare-gui/src/gui/profile/StatusMessage.ui
index bd011c4d3..0f537c280 100644
--- a/retroshare-gui/src/gui/profile/StatusMessage.ui
+++ b/retroshare-gui/src/gui/profile/StatusMessage.ui
@@ -33,7 +33,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
+    <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
   <widget class="QFrame" name="frame">
    <property name="geometry">
@@ -174,6 +174,7 @@ border: 1px solid #CCCCCC;}
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui
index ecc2bcf6a..17c25818a 100644
--- a/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui
+++ b/retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -187,6 +187,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/ChatToaster.ui b/retroshare-gui/src/gui/toaster/ChatToaster.ui
index 2368bdf5b..4215cf176 100644
--- a/retroshare-gui/src/gui/toaster/ChatToaster.ui
+++ b/retroshare-gui/src/gui/toaster/ChatToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -187,6 +187,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/DownloadToaster.ui b/retroshare-gui/src/gui/toaster/DownloadToaster.ui
index 1ea282278..8dcc08d8d 100644
--- a/retroshare-gui/src/gui/toaster/DownloadToaster.ui
+++ b/retroshare-gui/src/gui/toaster/DownloadToaster.ui
@@ -69,8 +69,11 @@
             <height>16</height>
            </size>
           </property>
+          <property name="layoutDirection">
+           <enum>Qt::LeftToRight</enum>
+          </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -185,6 +188,7 @@
  </tabstops>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui
index bdb97cb96..6a8bcbd8a 100644
--- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui
+++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -193,6 +193,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.ui b/retroshare-gui/src/gui/toaster/GroupChatToaster.ui
index 88617914b..97dcb59e9 100644
--- a/retroshare-gui/src/gui/toaster/GroupChatToaster.ui
+++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -187,6 +187,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui
index 4b4724214..b6cc1dee9 100644
--- a/retroshare-gui/src/gui/toaster/MessageToaster.ui
+++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -198,6 +198,7 @@
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/toaster/OnlineToaster.ui b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
index 85dd9b2dd..d10407618 100644
--- a/retroshare-gui/src/gui/toaster/OnlineToaster.ui
+++ b/retroshare-gui/src/gui/toaster/OnlineToaster.ui
@@ -70,7 +70,7 @@
            </size>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
+           <pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -187,6 +187,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>