diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index 92747816b..bea9959d9 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -86,7 +86,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 	}
 
 	connect(ui.cmboTollButtonsSize,           SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonSize() ));
-	connect(ui.cmboListItemSize,              SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize()   ));
+//	connect(ui.cmboListItemSize,              SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize()   ));
 	connect(ui.cmboTollButtonsStyle,          SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonStyle()));
 	connect(ui.cmboLanguage,                  SIGNAL(currentIndexChanged(int)), this, SLOT(updateLanguageCode()       ));
 	connect(ui.cmboStyle,                     SIGNAL(currentIndexChanged(int)), this, SLOT(updateInterfaceStyle()     ));
@@ -94,7 +94,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 	connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)),           this, SLOT(updateStatusToolTip()    ));
 
 	connect(ui.mainPageButtonType_CB,  SIGNAL(currentIndexChanged(int)),           this, SLOT(updateRbtPageOnToolBar()    ));
-	connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)),           this, SLOT(updateActionButtonLoc()    ));
+//	connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)),           this, SLOT(updateActionButtonLoc()    ));
 }
 
 void AppearancePage::switch_status_grpStatus(bool b)        { switch_status(MainWindow::StatusGrpStatus  ,"ShowStatusBar",         b) ; }
@@ -133,11 +133,7 @@ void AppearancePage::updateSheetName()        { Settings->setSheetName(ui.cmboSt
 void AppearancePage::updateRbtPageOnToolBar()
 {
     Settings->setPageButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
-    NotifyQt::getInstance()->notifySettingsChanged();
-}
-void AppearancePage::updateActionButtonLoc()
-{
-    Settings->setActionButtonLoc(!ui.menuItemsButtonType_CB->currentIndex());
+    Settings->setActionButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
     NotifyQt::getInstance()->notifySettingsChanged();
 }
 void AppearancePage::updateStatusToolTip()    { MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); }
@@ -168,50 +164,56 @@ void AppearancePage::updateCmboToolButtonSize()
 	{
 		case 0:
 			Settings->setToolButtonSize(8);
-		break;
-		case 1:
-			Settings->setToolButtonSize(16);
-		break;
-		case 2:
-		default:
-			Settings->setToolButtonSize(24);
-		break;
-		case 3:
-			Settings->setToolButtonSize(32);
-        break;
-        case 4:
-            Settings->setToolButtonSize(64);
-        break;
-        case 5:
-            Settings->setToolButtonSize(128);
-    }
-    NotifyQt::getInstance()->notifySettingsChanged();
-}
-void AppearancePage::updateCmboListItemSize()
-{
-	switch (ui.cmboListItemSize->currentIndex())
-	{
-		case 0:
 			Settings->setListItemIconSize(8);
 		break;
 		case 1:
+			Settings->setToolButtonSize(16);
 			Settings->setListItemIconSize(16);
 		break;
 		case 2:
 		default:
+			Settings->setToolButtonSize(24);
 			Settings->setListItemIconSize(24);
 		break;
 		case 3:
+			Settings->setToolButtonSize(32);
 			Settings->setListItemIconSize(32);
         break;
         case 4:
-            Settings->setListItemIconSize(64);
+            Settings->setToolButtonSize(64);
+			Settings->setListItemIconSize(64);
         break;
         case 5:
-            Settings->setListItemIconSize(128);
+            Settings->setToolButtonSize(128);
+			Settings->setListItemIconSize(128);
     }
     NotifyQt::getInstance()->notifySettingsChanged();
 }
+// void AppearancePage::updateCmboListItemSize()
+// {
+// 	switch (ui.cmboListItemSize->currentIndex())
+// 	{
+// 		case 0:
+// 			Settings->setListItemIconSize(8);
+// 		break;
+// 		case 1:
+// 			Settings->setListItemIconSize(16);
+// 		break;
+// 		case 2:
+// 		default:
+// 			Settings->setListItemIconSize(24);
+// 		break;
+// 		case 3:
+// 			Settings->setListItemIconSize(32);
+//         break;
+//         case 4:
+//             Settings->setListItemIconSize(64);
+//         break;
+//         case 5:
+//             Settings->setListItemIconSize(128);
+//     }
+//     NotifyQt::getInstance()->notifySettingsChanged();
+// }
 
 void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); }
 
@@ -232,7 +234,7 @@ void AppearancePage::load()
 	ui.cmboStyleSheet->setCurrentIndex(index);
 
 	ui.mainPageButtonType_CB->setCurrentIndex(!Settings->getPageButtonLoc());
-	ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc());
+//	ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc());
 
 	switch (Settings->getToolButtonStyle())
 	{
@@ -270,27 +272,27 @@ void AppearancePage::load()
         case 128:
             ui.cmboTollButtonsSize->setCurrentIndex(5);
     }
-	switch (Settings->getListItemIconSize())
-	{
-		case 8:
-			ui.cmboListItemSize->setCurrentIndex(0);
-		break;
-		case 16:
-			ui.cmboListItemSize->setCurrentIndex(1);
-		break;
-		case 24:
-		default:
-			ui.cmboListItemSize->setCurrentIndex(2);
-		break;
-		case 32:
-			ui.cmboListItemSize->setCurrentIndex(3);
-        break;
-        case 64:
-            ui.cmboListItemSize->setCurrentIndex(4);
-        break;
-        case 128:
-            ui.cmboListItemSize->setCurrentIndex(5);
-    }
+//	switch (Settings->getListItemIconSize())
+//	{
+//		case 8:
+//			ui.cmboListItemSize->setCurrentIndex(0);
+//		break;
+//		case 16:
+//			ui.cmboListItemSize->setCurrentIndex(1);
+//		break;
+//		case 24:
+//		default:
+//			ui.cmboListItemSize->setCurrentIndex(2);
+//		break;
+//		case 32:
+//			ui.cmboListItemSize->setCurrentIndex(3);
+//        break;
+//        case 64:
+//            ui.cmboListItemSize->setCurrentIndex(4);
+//        break;
+//        case 128:
+//            ui.cmboListItemSize->setCurrentIndex(5);
+//    }
 
 	ui.grpStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool());
 	ui.checkBoxStatusCompactMode->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool());
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h
index a80b97d1a..09610a22d 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.h
+++ b/retroshare-gui/src/gui/settings/AppearancePage.h
@@ -62,12 +62,12 @@ private slots:
     void updateInterfaceStyle()  ;
     void updateSheetName()       ;
     void updateRbtPageOnToolBar();
-    void updateActionButtonLoc() ;
+//    void updateActionButtonLoc() ;
     void updateStatusToolTip()   ;
 
 	void updateCmboToolButtonStyle();
 	void updateCmboToolButtonSize();
-	void updateCmboListItemSize();
+//	void updateCmboListItemSize();
 
 	void updateStyle() ;
 private:
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui
index f05634f8f..4eecd3e3d 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1160</width>
+    <width>1170</width>
     <height>897</height>
    </rect>
   </property>
@@ -237,44 +237,6 @@
         </item>
        </layout>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="labelActionToolBar">
-          <property name="text">
-           <string>Menu  items:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="menuItemsButtonType_CB">
-          <item>
-           <property name="text">
-            <string>Buttons</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Item list</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item>
-         <spacer name="frameActionHSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>300</width>
-            <height>16</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
       <item>
        <widget class="QFrame" name="frameToolListStyle">
         <property name="sizePolicy">
@@ -324,19 +286,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="labelListItemStyle">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Choose the style of List Items.</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="0">
           <widget class="QComboBox" name="cmboTollButtonsSize">
            <item>
@@ -371,40 +320,6 @@
            </item>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QComboBox" name="cmboListItemSize">
-           <item>
-            <property name="text">
-             <string>Icon Size = 8x8</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 16x16</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 24x24</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 32x32</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 64x64</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 128x128</string>
-            </property>
-           </item>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index b2f5d8478..d90bb308c 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -45,12 +45,11 @@
 #define IMAGE_CHAT_DELETE   ":/images/deletemail24.png"
 #define IMAGE_CHAT_COPY     ":/images/copyrslink.png"
 
-static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWidget, QComboBox *comboBox, QString &styleVariant)
+static QString loadStyleInfo(ChatStyle::enumStyleType type, QComboBox *style_CB, QComboBox *comboBox, QString &styleVariant)
 {
     QList<ChatStyleInfo> styles;
     QList<ChatStyleInfo>::iterator style;
-    QListWidgetItem *item;
-    QListWidgetItem *activeItem = NULL;
+    int activeItem = 0;
 
     QString stylePath;
 
@@ -69,17 +68,22 @@ static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWid
     }
 
     ChatStyle::getAvailableStyles(type, styles);
-    for (style = styles.begin(); style != styles.end(); ++style) {
-        item = new QListWidgetItem(style->styleName);
-        item->setData(Qt::UserRole, qVariantFromValue(*style));
-        listWidget->addItem(item);
+
+    while(style_CB->count())
+		style_CB->removeItem(0) ;
+
+    int n=0;
+    for (style = styles.begin(); style != styles.end(); ++style,++n)
+    {
+        style_CB->insertItem(n,style->styleName);
+        style_CB->setItemData(n, qVariantFromValue(*style),Qt::UserRole);
 
         if (style->stylePath == stylePath) {
-            activeItem = item;
+            activeItem = n;
         }
     }
 
-    listWidget->setCurrentItem(activeItem);
+    style_CB->setCurrentIndex(activeItem);
 
     /* now the combobox should be filled */
 
@@ -165,40 +169,31 @@ void ChatPage::updateHistoryParams()
 
 void ChatPage::updatePublicStyle()
 {
-	ChatStyleInfo info;
-	QListWidgetItem *item = ui.publicList->currentItem();
-	if (item) {
-		info = item->data(Qt::UserRole).value<ChatStyleInfo>();
-		if (publicStylePath != info.stylePath || publicStyleVariant != ui.publicComboBoxVariant->currentText()) {
-			Settings->setPublicChatStyle(info.stylePath, ui.publicComboBoxVariant->currentText());
-			NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PUBLIC);
-		}
+	ChatStyleInfo info = ui.publicStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
+
+	if (publicStylePath != info.stylePath || publicStyleVariant != ui.publicComboBoxVariant->currentText()) {
+		Settings->setPublicChatStyle(info.stylePath, ui.publicComboBoxVariant->currentText());
+		NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PUBLIC);
 	}
 }
 
 void ChatPage::updatePrivateStyle()
 {
-	ChatStyleInfo info;
-	QListWidgetItem *item = ui.privateList->currentItem();
-	if (item) {
-		info = item->data(Qt::UserRole).value<ChatStyleInfo>();
-		if (privateStylePath != info.stylePath || privateStyleVariant != ui.privateComboBoxVariant->currentText()) {
-			Settings->setPrivateChatStyle(info.stylePath, ui.privateComboBoxVariant->currentText());
-			NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PRIVATE);
-		}
+	ChatStyleInfo info = ui.privateStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
+
+	if (privateStylePath != info.stylePath || privateStyleVariant != ui.privateComboBoxVariant->currentText()) {
+		Settings->setPrivateChatStyle(info.stylePath, ui.privateComboBoxVariant->currentText());
+		NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PRIVATE);
 	}
 }
 
 void ChatPage::updateHistoryStyle()
 {
-	ChatStyleInfo info;
-	QListWidgetItem *item = ui.historyList->currentItem();
-	if (item) {
-		info = item->data(Qt::UserRole).value<ChatStyleInfo>();
-		if (historyStylePath != info.stylePath || historyStyleVariant != ui.historyComboBoxVariant->currentText()) {
-			Settings->setHistoryChatStyle(info.stylePath, ui.historyComboBoxVariant->currentText());
-			NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_HISTORY);
-		}
+	ChatStyleInfo info = ui.historyStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
+
+	if (historyStylePath != info.stylePath || historyStyleVariant != ui.historyComboBoxVariant->currentText()) {
+		Settings->setHistoryChatStyle(info.stylePath, ui.historyComboBoxVariant->currentText());
+		NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_HISTORY);
 	}
 }
 
@@ -251,13 +246,13 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
 	connect(ui.privateChatSaveCount,       SIGNAL(valueChanged(int)),        this, SLOT(updateHistoryParams()));
 	connect(ui.lobbyChatSaveCount,         SIGNAL(valueChanged(int)),        this, SLOT(updateHistoryParams()));
 
-    connect(ui.publicList,                 SIGNAL(currentRowChanged(int)),   this, SLOT(updatePublicStyle())) ;
+    connect(ui.publicStyle,                SIGNAL(currentIndexChanged(int)),   this, SLOT(updatePublicStyle())) ;
     connect(ui.publicComboBoxVariant,      SIGNAL(currentIndexChanged(int)), this, SLOT(updatePublicStyle())) ;
 
-    connect(ui.privateList,                SIGNAL(currentRowChanged(int)),   this, SLOT(updatePrivateStyle())) ;
+    connect(ui.privateStyle,                SIGNAL(currentIndexChanged(int)),   this, SLOT(updatePrivateStyle())) ;
     connect(ui.privateComboBoxVariant,     SIGNAL(currentIndexChanged(int)), this, SLOT(updatePrivateStyle())) ;
 
-    connect(ui.historyList,                SIGNAL(currentRowChanged(int)),   this, SLOT(updateHistoryStyle())) ;
+    connect(ui.historyStyle,                SIGNAL(currentIndexChanged(int)),   this, SLOT(updateHistoryStyle())) ;
     connect(ui.historyComboBoxVariant,     SIGNAL(currentIndexChanged(int)), this, SLOT(updateHistoryStyle())) ;
 
     connect(ui.max_storage_period,         SIGNAL(valueChanged(int)),        this, SLOT(updateHistoryStorage())) ;
@@ -268,6 +263,10 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
 	connect(ui.chat_Blink,                 SIGNAL(toggled(bool)),            this, SLOT(updateChatFlags()));
 
 	connect(ui.chatLobby_Blink,            SIGNAL(toggled(bool)),            this, SLOT(updateChatLobbyFlags()));
+
+	connect(ui.publicStyle,                SIGNAL(currentIndexChanged(int)), this,SLOT(on_publicList_currentRowChanged(int)));
+	connect(ui.privateStyle,               SIGNAL(currentIndexChanged(int)), this,SLOT(on_privateList_currentRowChanged(int)));
+	connect(ui.historyStyle,               SIGNAL(currentIndexChanged(int)), this,SLOT(on_historyList_currentRowChanged(int)));
 }
 void ChatPage::updateChatFlags()
 {
@@ -359,9 +358,9 @@ ChatPage::load()
 	 ui.max_storage_period->setValue(rsHistory->getMaxStorageDuration()/86400) ;
 
     /* Load styles */
-    publicStylePath = loadStyleInfo(ChatStyle::TYPE_PUBLIC, ui.publicList, ui.publicComboBoxVariant, publicStyleVariant);
-    privateStylePath = loadStyleInfo(ChatStyle::TYPE_PRIVATE, ui.privateList, ui.privateComboBoxVariant, privateStyleVariant);
-    historyStylePath = loadStyleInfo(ChatStyle::TYPE_HISTORY, ui.historyList, ui.historyComboBoxVariant, historyStyleVariant);
+    publicStylePath = loadStyleInfo(ChatStyle::TYPE_PUBLIC, ui.publicStyle, ui.publicComboBoxVariant, publicStyleVariant);
+    privateStylePath = loadStyleInfo(ChatStyle::TYPE_PRIVATE, ui.privateStyle, ui.privateComboBoxVariant, privateStyleVariant);
+    historyStylePath = loadStyleInfo(ChatStyle::TYPE_HISTORY, ui.historyStyle, ui.historyComboBoxVariant, historyStyleVariant);
 
     RsGxsId gxs_id ;
     rsMsgs->getDefaultIdentityForChatLobby(gxs_id) ;
@@ -438,23 +437,17 @@ void ChatPage::setPreviewMessages(QString &stylePath, QString styleVariant, QTex
     textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING,  tr("UserName"), timestmp, tr("/me is sending a message with /me"), 0, backgroundColor));
 }
 
-void ChatPage::fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser)
+void ChatPage::fillPreview(QComboBox *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser)
 {
-    QListWidgetItem *item = listWidget->currentItem();
-    if (item) {
-        ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
+	ChatStyleInfo info = listWidget->itemData(listWidget->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
 
-        setPreviewMessages(info.stylePath, comboBox->currentText(), textBrowser);
-    } else {
-        textBrowser->clear();
-    }
+	setPreviewMessages(info.stylePath, comboBox->currentText(), textBrowser);
 }
 
 void ChatPage::on_publicList_currentRowChanged(int currentRow)
 {
     if (currentRow != -1) {
-        QListWidgetItem *item = ui.publicList->item(currentRow);
-        ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
+        ChatStyleInfo info = ui.publicStyle->itemData(currentRow,Qt::UserRole).value<ChatStyleInfo>();
 
         QString author = info.authorName;
         if (info.authorEmail.isEmpty() == false) {
@@ -483,14 +476,13 @@ void ChatPage::on_publicList_currentRowChanged(int currentRow)
         ui.publicComboBoxVariant->setDisabled(true);
     }
 
-    fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview);
+    fillPreview(ui.publicStyle, ui.publicComboBoxVariant, ui.publicPreview);
 }
 
 void ChatPage::on_privateList_currentRowChanged(int currentRow)
 {
     if (currentRow != -1) {
-        QListWidgetItem *item = ui.privateList->item(currentRow);
-        ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
+        ChatStyleInfo info = ui.privateStyle->itemData(ui.privateStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
 
         QString author = info.authorName;
         if (info.authorEmail.isEmpty() == false) {
@@ -519,14 +511,13 @@ void ChatPage::on_privateList_currentRowChanged(int currentRow)
         ui.privateComboBoxVariant->setDisabled(true);
     }
 
-    fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview);
+    fillPreview(ui.privateStyle, ui.privateComboBoxVariant, ui.privatePreview);
 }
 
 void ChatPage::on_historyList_currentRowChanged(int currentRow)
 {
     if (currentRow != -1) {
-        QListWidgetItem *item = ui.historyList->item(currentRow);
-        ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
+        ChatStyleInfo info = ui.historyStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
 
         QString author = info.authorName;
         if (info.authorEmail.isEmpty() == false) {
@@ -555,22 +546,22 @@ void ChatPage::on_historyList_currentRowChanged(int currentRow)
         ui.historyComboBoxVariant->setDisabled(true);
     }
 
-    fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview);
+    fillPreview(ui.historyStyle, ui.historyComboBoxVariant, ui.historyPreview);
 }
 
 void ChatPage::on_publicComboBoxVariant_currentIndexChanged(int /*index*/)
 {
-    fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview);
+    fillPreview(ui.publicStyle, ui.publicComboBoxVariant, ui.publicPreview);
 }
 
 void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int /*index*/)
 {
-    fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview);
+    fillPreview(ui.privateStyle, ui.privateComboBoxVariant, ui.privatePreview);
 }
 
 void ChatPage::on_historyComboBoxVariant_currentIndexChanged(int /*index*/)
 {
-    fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview);
+    fillPreview(ui.historyStyle, ui.historyComboBoxVariant, ui.historyPreview);
 }
 
 void ChatPage::on_cbSearch_WithoutLimit_toggled(bool checked)
diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h
index 8f7048e2c..40ef1d8c9 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.h
+++ b/retroshare-gui/src/gui/settings/ChatPage.h
@@ -70,7 +70,7 @@ class ChatPage : public ConfigPage
 
   private:
       void setPreviewMessages(QString &stylePath, QString styleVariant, QTextBrowser *textBrowser);
-      void fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser);
+      void fillPreview(QComboBox *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser);
 
       QFont fontTempChat;
 
diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui
index de8ffbdb4..152e3530e 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.ui
+++ b/retroshare-gui/src/gui/settings/ChatPage.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>635</width>
-    <height>600</height>
+    <width>1216</width>
+    <height>1107</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="3" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="general">
       <attribute name="title">
@@ -866,109 +866,75 @@
           <enum>QTabWidget::North</enum>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>2</number>
          </property>
          <widget class="QWidget" name="publicTab">
           <attribute name="title">
            <string>Group chat</string>
           </attribute>
-          <layout class="QVBoxLayout" name="publicTabVLayout">
+          <layout class="QVBoxLayout" name="verticalLayout">
            <item>
-            <layout class="QHBoxLayout" name="publicStyleHLayout">
+            <widget class="QTextBrowser" name="publicPreview">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout">
              <item>
-              <layout class="QVBoxLayout" name="publicStyleListVLayout">
-               <item>
-                <widget class="QListWidget" name="publicList">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="maximumSize">
-                  <size>
-                   <width>170</width>
-                   <height>16777215</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="publicStyleVarHLayout">
-                 <item>
-                  <widget class="QLabel" name="publicLabelVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string>Variant</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QComboBox" name="publicComboBoxVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Style:</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <widget class="QTextBrowser" name="publicPreview">
+              <widget class="QComboBox" name="publicStyle"/>
+             </item>
+             <item>
+              <widget class="QLabel" name="publicLabelVariant">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Variant:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="publicComboBoxVariant">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer">
+               <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>
            <item>
             <layout class="QHBoxLayout" name="publicInfoLayout">
-             <item>
-              <layout class="QVBoxLayout" name="publicLabelLayout">
-               <property name="sizeConstraint">
-                <enum>QLayout::SetFixedSize</enum>
-               </property>
-               <item>
-                <widget class="QLabel" name="publicLabelAuthor">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Author:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="publicLabelDescription">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Description:</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
              <item>
               <layout class="QVBoxLayout" name="publicLayout">
                <item>
@@ -999,6 +965,19 @@
                </item>
               </layout>
              </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>
@@ -1007,103 +986,69 @@
           <attribute name="title">
            <string>Private chat</string>
           </attribute>
-          <layout class="QVBoxLayout" name="privateTabVLayout">
+          <layout class="QVBoxLayout" name="verticalLayout_2">
            <item>
-            <layout class="QHBoxLayout" name="privateStyleHLayout">
+            <widget class="QTextBrowser" name="privatePreview">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
              <item>
-              <layout class="QVBoxLayout" name="privateStyleListVLayout">
-               <item>
-                <widget class="QListWidget" name="privateList">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="maximumSize">
-                  <size>
-                   <width>170</width>
-                   <height>16777215</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="privateStyleVarHLayout">
-                 <item>
-                  <widget class="QLabel" name="privateLabelVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string>Variant</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QComboBox" name="privateComboBoxVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>Style:</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <widget class="QTextBrowser" name="privatePreview">
+              <widget class="QComboBox" name="privateStyle"/>
+             </item>
+             <item>
+              <widget class="QLabel" name="privateLabelVariant">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Variant:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="privateComboBoxVariant">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <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>
            <item>
             <layout class="QHBoxLayout" name="privateInfoLayout">
-             <item>
-              <layout class="QVBoxLayout" name="privateLabelLayout">
-               <property name="sizeConstraint">
-                <enum>QLayout::SetFixedSize</enum>
-               </property>
-               <item>
-                <widget class="QLabel" name="privateLabelAuthor">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Author:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="privateLabelDescription">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Description:</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
              <item>
               <layout class="QVBoxLayout" name="privateLayout">
                <item>
@@ -1134,6 +1079,19 @@
                </item>
               </layout>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <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>
@@ -1142,103 +1100,69 @@
           <attribute name="title">
            <string>History</string>
           </attribute>
-          <layout class="QVBoxLayout" name="historyTabVLayout">
+          <layout class="QVBoxLayout" name="verticalLayout_3">
            <item>
-            <layout class="QHBoxLayout" name="historyStyleHLayout">
+            <widget class="QTextBrowser" name="historyPreview">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
              <item>
-              <layout class="QVBoxLayout" name="historyStyleListVLayout">
-               <item>
-                <widget class="QListWidget" name="historyList">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="maximumSize">
-                  <size>
-                   <width>170</width>
-                   <height>16777215</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="historyStyleVarHLayout">
-                 <item>
-                  <widget class="QLabel" name="historyLabelVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="text">
-                    <string>Variant</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QComboBox" name="historyComboBoxVariant">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
+              <widget class="QLabel" name="label_3">
+               <property name="text">
+                <string>Style:</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <widget class="QTextBrowser" name="historyPreview">
+              <widget class="QComboBox" name="historyStyle"/>
+             </item>
+             <item>
+              <widget class="QLabel" name="historyLabelVariant">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Variant:</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="historyComboBoxVariant">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_6">
+               <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>
            <item>
             <layout class="QHBoxLayout" name="historyInfoLayout">
-             <item>
-              <layout class="QVBoxLayout" name="historyLabelLayout">
-               <property name="sizeConstraint">
-                <enum>QLayout::SetFixedSize</enum>
-               </property>
-               <item>
-                <widget class="QLabel" name="historyLabelAuthor">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Author:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="historyLabelDescription">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Description:</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
              <item>
               <layout class="QVBoxLayout" name="historyLayout">
                <item>
@@ -1269,6 +1193,19 @@
                </item>
               </layout>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_5">
+               <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/settings/PluginsPage.ui b/retroshare-gui/src/gui/settings/PluginsPage.ui
index 895bafed7..3da9a5696 100644
--- a/retroshare-gui/src/gui/settings/PluginsPage.ui
+++ b/retroshare-gui/src/gui/settings/PluginsPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>423</width>
-    <height>340</height>
+    <height>514</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -16,6 +16,12 @@
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QCheckBox" name="enableAll">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>Authorize all plugins</string>
      </property>
@@ -29,6 +35,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <widget class="QScrollArea" name="scrollArea">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
@@ -40,7 +52,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>920</width>
+           <width>345</width>
            <height>16</height>
           </rect>
          </property>
@@ -54,7 +66,16 @@
           <property name="spacing">
            <number>3</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>
          </layout>
@@ -71,11 +92,31 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QTextBrowser" name="_lookupDirectories_TB"/>
+       <widget class="QTextBrowser" name="_lookupDirectories_TB">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/retroshare-gui/src/gui/settings/RelayPage.ui b/retroshare-gui/src/gui/settings/RelayPage.ui
index 78e7a7074..f753b0c49 100644
--- a/retroshare-gui/src/gui/settings/RelayPage.ui
+++ b/retroshare-gui/src/gui/settings/RelayPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>486</width>
-    <height>360</height>
+    <width>794</width>
+    <height>546</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -64,7 +64,16 @@
       <string>Relay options</string>
      </property>
      <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>
       <property name="spacing">
@@ -318,25 +327,6 @@
       <string>Relay Server Setup</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <property name="horizontalSpacing">
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLineEdit" name="DhtLineEdit">
-        <property name="inputMask">
-         <string notr="true">HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH; </string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QCheckBox" name="keyOkBox">
         <property name="enabled">
@@ -357,6 +347,16 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLineEdit" name="DhtLineEdit">
+        <property name="inputMask">
+         <string notr="true">HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0" colspan="2">
        <widget class="QTreeWidget" name="serverTreeWidget">
         <column>
@@ -376,6 +376,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 894545470..1893bdc7e 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>724</width>
-    <height>568</height>
+    <width>1220</width>
+    <height>884</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="ServerPageVLayout">
@@ -26,7 +26,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tabNetConf">
       <attribute name="title">
@@ -506,11 +506,25 @@ behind a firewall or a VPN.</string>
          </property>
         </widget>
        </item>
+       <item row="6" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
       <zorder>showDiscStatusBar</zorder>
       <zorder>allowIpDeterminationCB</zorder>
       <zorder>IPServersLV</zorder>
       <zorder>ipAddressList</zorder>
+      <zorder>verticalSpacer</zorder>
      </widget>
      <widget class="QWidget" name="tabIPFilters">
       <attribute name="title">
@@ -765,6 +779,19 @@ behind a firewall or a VPN.</string>
             </item>
            </layout>
           </item>
+          <item>
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 9819b267e..5d69fcdba 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>741</width>
-    <height>422</height>
+    <width>754</width>
+    <height>512</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -181,6 +181,19 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>