diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index f2da31f00..25d654da8 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -173,6 +173,12 @@ FriendsDialog::FriendsDialog(QWidget *parent)
 //
 //    ui.menutoolButton->setMenu(menu);
 
+    QToolButton *addFriendButton = new QToolButton(this);
+    addFriendButton->setIcon(QIcon(":/images/user/add_user24.png"));
+    addFriendButton->setToolTip(tr("Add Friend"));
+    connect(addFriendButton, SIGNAL(clicked()), this, SLOT(addFriend()));
+    ui.friendList->addToolButton(addFriendButton);
+
     setAcceptDrops(true);
     ui.lineEdit->setAcceptDrops(false);
     ui.hashBox->setDropWidget(this);
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index f2817c0e8..ba3be3119 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -229,21 +229,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
     applicationWindow->hide();
     #endif    
 
-    /** Left Side ToolBar**/
-    connect(actionAdd_Friend, SIGNAL(triggered() ), this , SLOT( addFriend() ) );
-    connect(actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) );
-    connect(actionOptions, SIGNAL(triggered()), this, SLOT( showSettings()) );
-//    connect(actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) );
-    connect(actionServicePermissions, SIGNAL(triggered()), this, SLOT(servicePermission()));
-
-    actionMessenger->setVisible(false);
-
-    connect(actionAbout, SIGNAL(triggered()), this, SLOT( showabout()) );
-    //connect(actionColor, SIGNAL(triggered()), this, SLOT( setStyle()) );
-
-    /** adjusted quit behaviour: trigger a warning that can be switched off in the saved
-        config file RetroShare.conf */
-    connect(actionQuit, SIGNAL(triggered()), this, SLOT(doQuit()));
 
     QList<QPair<MainPage*, QAction*> > notify;
 
@@ -255,8 +240,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
                        action = createPageAction(QIcon(IMAGE_NEWSFEED), tr("News feed"), grp));
     notify.push_back(QPair<MainPage*, QAction*>(newsFeed, action));
 
-//    stackPages->add(networkDialog = new NetworkDialog(stackPages),
-//                       createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp));
 
     stackPages->add(friendsDialog = new FriendsDialog(stackPages),
                        action = createPageAction(QIcon(IMAGE_PEERS), tr("Network"), grp));
@@ -270,9 +253,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
     stackPages->add(circlesDialog = new CirclesDialog(stackPages), createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
     notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
 
-//    stackPages->add(searchDialog = new SearchDialog(stackPages),
-//                       createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp));
-
     stackPages->add(transfersDialog = new TransfersDialog(stackPages),
                       action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp));
     notify.push_back(QPair<MainPage*, QAction*>(transfersDialog, action));
@@ -356,6 +336,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
     addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), toolBar), SLOT(showApplWindow()));
 #endif
 
+    addAction(new QAction(QIcon(IMAGE_OPTIONS), tr("Options"), toolBar), SLOT(showSettings()));
+    addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), toolBar), SLOT(showabout()));
+    addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), toolBar), SLOT(doQuit()));
+
+
     stackPages->setCurrentIndex(Settings->getLastPageInMainWindow());
 
     /** StatusBar section ********/
diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui
index 9255b555b..b880d232f 100644
--- a/retroshare-gui/src/gui/MainWindow.ui
+++ b/retroshare-gui/src/gui/MainWindow.ui
@@ -15,7 +15,16 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <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 row="0" column="0">
@@ -38,26 +47,6 @@
     <bool>false</bool>
    </attribute>
   </widget>
-  <widget class="QToolBar" name="toolBar_2">
-   <property name="contextMenuPolicy">
-    <enum>Qt::CustomContextMenu</enum>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>LeftToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionAdd_Friend"/>
-   <addaction name="actionAdd_Share"/>
-   <addaction name="actionServicePermissions"/>
-   <addaction name="separator"/>
-   <addaction name="actionMessenger"/>
-   <addaction name="actionAbout"/>
-   <addaction name="actionOptions"/>
-   <addaction name="separator"/>
-   <addaction name="actionQuit"/>
-  </widget>
   <action name="actionAdd_Friend">
    <property name="icon">
     <iconset resource="images.qrc">
diff --git a/retroshare-gui/src/gui/common/FriendList.ui b/retroshare-gui/src/gui/common/FriendList.ui
index d1d78da1e..a9503f12c 100644
--- a/retroshare-gui/src/gui/common/FriendList.ui
+++ b/retroshare-gui/src/gui/common/FriendList.ui
@@ -14,7 +14,16 @@
    <property name="spacing">
     <number>0</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>
@@ -29,7 +38,16 @@
       <property name="spacing">
        <number>3</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
        <number>2</number>
       </property>
       <item>
@@ -55,8 +73,8 @@
         </property>
         <property name="iconSize">
          <size>
-          <width>32</width>
-          <height>16</height>
+          <width>24</width>
+          <height>24</height>
          </size>
         </property>
         <property name="popupMode">