diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 4f2b63630..f54775ac2 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -60,9 +60,9 @@
 #define FONT        QFont(tr("Arial"), 8)
 
 /* Images for toolbar icons */
-#define IMAGE_NETWORK           ":/images/network32.png"
+#define IMAGE_NETWORK           ":/images/retrosharelogo1.png"
 #define IMAGE_PEERS         	":/images/groupchat.png"
-#define IMAGE_SEARCH    	    ":/images/filefind.png"
+#define IMAGE_SEARCH    	":/images/filefind.png"
 #define IMAGE_TRANSFERS      	":/images/ktorrent32.png"
 #define IMAGE_LINKS             ":/images/knewsticker24.png"
 #define IMAGE_FILES   	        ":/images/fileshare24.png"
@@ -78,7 +78,7 @@
 #define IMAGE_RSM32             ":/images/kdmconfig.png"
 #define IMAGE_RSM16             ":/images/rsmessenger16.png"
 #define IMAGE_CLOSE             ":/images/close_normal.png"
-#define IMAGE_SMPLAYER		    ":/images/smplayer_icon32.png"
+#define IMAGE_SMPLAYER		":/images/smplayer_icon32.png"
 #define IMAGE_BLOCK         	":/images/blockdevice.png"
 #define IMAGE_COLOR         	":/images/highlight.png"
 #define IMAGE_GAMES             ":/images/kgames.png"
diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp
index 4bc715304..f8ee219db 100644
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@@ -154,6 +154,7 @@ PeersDialog::PeersDialog(QWidget *parent)
   timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat()));
   timer->start(500); /* half a second */
 
+	ui.peertreeWidget->sortItems( 1, Qt::AscendingOrder );
 
 
   /* Hide platform specific features */
diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui
index bb0468b1b..e8dd66b75 100644
--- a/retroshare-gui/src/gui/PeersDialog.ui
+++ b/retroshare-gui/src/gui/PeersDialog.ui
@@ -532,6 +532,9 @@ p, li { white-space: pre-wrap; }
        <property name="acceptDrops" >
         <bool>false</bool>
        </property>
+       <property name="autoScroll" >
+        <bool>false</bool>
+       </property>
        <property name="iconSize" >
         <size>
          <width>24</width>
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
index 6d5e9899a..8933e6eff 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
@@ -610,11 +610,11 @@ void CreateForumMsg::setupViewActions()
     QMenu *menu = new QMenu(tr("&View"), this);
     menuBar()->addMenu(menu);
 
-    QAction *a;
+    //QAction *a;
 
-    a = new QAction(QIcon(""), tr("&Contacts Sidebar"), this);
+    /*a = new QAction(QIcon(""), tr("&Contacts Sidebar"), this);
     connect(a, SIGNAL(triggered()), this, SLOT(toggleContacts()));
-    menu->addAction(a);
+    menu->addAction(a);*/
 
 }
 
@@ -623,10 +623,11 @@ void CreateForumMsg::setupInsertActions()
     QMenu *menu = new QMenu(tr("&Insert"), this);
     menuBar()->addMenu(menu);
 
-    QAction *a;
+    //QAction *a;
 
-    a = new QAction(QIcon(""), tr("&Image"), this);
+    /*a = new QAction(QIcon(""), tr("&Image"), this);
     connect(a, SIGNAL(triggered()), this, SLOT(addImage()));
-    menu->addAction(a);
+    menu->addAction(a);*/
+
+}
 
-}
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui
index 4f4ac40b8..fc5b58262 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>533</width>
-    <height>398</height>
+    <width>527</width>
+    <height>410</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,8 +20,17 @@
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" >
+    <property name="horizontalSpacing" >
+     <number>2</number>
+    </property>
+    <property name="verticalSpacing" >
+     <number>1</number>
+    </property>
     <item row="0" column="0" >
      <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="label_2" >
         <property name="text" >
@@ -40,6 +49,9 @@
     </item>
     <item row="1" column="0" >
      <layout class="QHBoxLayout" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QLabel" name="label" >
         <property name="text" >
@@ -85,6 +97,12 @@
     </item>
     <item row="3" column="0" >
      <layout class="QGridLayout" >
+      <property name="horizontalSpacing" >
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing" >
+       <number>0</number>
+      </property>
       <item row="0" column="0" >
        <widget class="QComboBox" name="comboStyle" />
       </item>
@@ -102,14 +120,14 @@
        <widget class="QPushButton" name="boldbtn" >
         <property name="minimumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="toolTip" >
@@ -127,14 +145,14 @@
        <widget class="QPushButton" name="underlinebtn" >
         <property name="minimumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="toolTip" >
@@ -152,14 +170,14 @@
        <widget class="QPushButton" name="italicbtn" >
         <property name="minimumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="toolTip" >
@@ -177,14 +195,14 @@
        <widget class="QPushButton" name="colorbtn" >
         <property name="minimumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="toolTip" >
@@ -199,14 +217,14 @@
        <widget class="QPushButton" name="textalignmentbtn" >
         <property name="minimumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>24</width>
-          <height>24</height>
+          <width>28</width>
+          <height>28</height>
          </size>
         </property>
         <property name="toolTip" >
@@ -255,7 +273,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>533</width>
+     <width>527</width>
      <height>30</height>
     </rect>
    </property>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 46dbcb497..5222bedb2 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -147,6 +147,7 @@
         <file>images/folder_yellow.png</file>
         <file>images/folder_green16.png</file>
         <file>images/folder_open.png</file>
+	<file>images/folder_video.png</file>
         <file>images/forward.png</file>
         <file>images/friendsfolder24.png</file>
         <file>images/kgames.png</file>
@@ -228,6 +229,7 @@
         <file>images/RetroShare16.png</file>
         <file>images/retrosharelogo1.png</file>
         <file>images/retrosharelogo2.png</file>
+        <file>images/retrosharelogo32.png</file>
         <file>images/rs-2.png</file>
         <file>images/rsmessenger16.png</file>
         <file>images/rsmessenger32.png</file>
diff --git a/retroshare-gui/src/gui/images/folder_music.png b/retroshare-gui/src/gui/images/folder_music.png
new file mode 100755
index 000000000..32a6c5134
Binary files /dev/null and b/retroshare-gui/src/gui/images/folder_music.png differ
diff --git a/retroshare-gui/src/gui/images/folder_video.png b/retroshare-gui/src/gui/images/folder_video.png
new file mode 100755
index 000000000..0e45d0cb9
Binary files /dev/null and b/retroshare-gui/src/gui/images/folder_video.png differ
diff --git a/retroshare-gui/src/gui/images/retrosharelogo32.png b/retroshare-gui/src/gui/images/retrosharelogo32.png
new file mode 100755
index 000000000..abe849812
Binary files /dev/null and b/retroshare-gui/src/gui/images/retrosharelogo32.png differ