diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index b7ed66ba3..92239b99a 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -200,6 +200,10 @@ SettingsDialog::SettingsDialog(QObject *parent )
 #ifndef Q_OS_MAC
     m_advancedWidget->setMinimumSize( m_advancedWidget->sizeHint() );
     m_accountsWidget->setMinimumWidth( 500 );
+#else
+    m_accountsWidget->setMinimumSize( 500, 350 );
+    m_collectionWidget->setMinimumHeight( m_collectionWidget->sizeHint().height() + 20 );
+    m_advancedWidget->setMinimumHeight( m_advancedWidget->sizeHint().height() + 4 );
 #endif
 
     // NOW PLAYING
diff --git a/src/Settings_Accounts.ui b/src/Settings_Accounts.ui
index 15c11cfdb..bea5d27b2 100644
--- a/src/Settings_Accounts.ui
+++ b/src/Settings_Accounts.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>508</width>
-    <height>476</height>
+    <width>405</width>
+    <height>347</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -56,6 +56,12 @@
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
+     <property name="verticalScrollMode">
+      <enum>QAbstractItemView::ScrollPerPixel</enum>
+     </property>
+     <property name="horizontalScrollMode">
+      <enum>QAbstractItemView::ScrollPerPixel</enum>
+     </property>
     </widget>
    </item>
   </layout>
diff --git a/src/Settings_Advanced.ui b/src/Settings_Advanced.ui
index fe7482db9..324bace00 100644
--- a/src/Settings_Advanced.ui
+++ b/src/Settings_Advanced.ui
@@ -10,12 +10,18 @@
     <height>475</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <widget class="QGroupBox" name="remoteConnectionsGroupBox">
diff --git a/src/Settings_Collection.ui b/src/Settings_Collection.ui
index 0517b80e7..a8899f57c 100644
--- a/src/Settings_Collection.ui
+++ b/src/Settings_Collection.ui
@@ -10,12 +10,18 @@
     <height>388</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">