diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index 9e449a387..7c5a8f964 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -195,6 +195,12 @@ SettingsDialog::SettingsDialog( QWidget *parent )
     }
     ui->advancedPage->setMinimumSize( ui->advancedPage->sizeHint() );
 
+    int buttonsWidth = qMax( ui->proxyButton->sizeHint().width(),
+                             ui->aclEntryClearButton->sizeHint().width() );
+    ui->proxyButton->setFixedWidth( buttonsWidth );
+    ui->aclEntryClearButton->setFixedWidth( buttonsWidth );
+
+
     // NOW PLAYING
 // #ifdef Q_WS_MAC
 //     ui->checkBoxEnableAdium->setChecked( s->nowPlayingEnabled() );
diff --git a/src/StackedSettingsDialog.ui b/src/StackedSettingsDialog.ui
index e260416d4..70d0c49fc 100644
--- a/src/StackedSettingsDialog.ui
+++ b/src/StackedSettingsDialog.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>0</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="accountsPage">
         <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -318,8 +318,30 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Expanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
                <item>
                 <widget class="QPushButton" name="proxyButton">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
                  <property name="text">
                   <string>Proxy Settings...</string>
                  </property>
@@ -353,7 +375,7 @@
                <item>
                 <widget class="QCheckBox" name="checkBoxHttp">
                  <property name="layoutDirection">
-                  <enum>Qt::RightToLeft</enum>
+                  <enum>Qt::LeftToRight</enum>
                  </property>
                  <property name="text">
                   <string>Allow web browsers to interact with Tomahawk (recommended)</string>
@@ -366,7 +388,7 @@
                <item>
                 <widget class="QCheckBox" name="checkBoxReporter">
                  <property name="layoutDirection">
-                  <enum>Qt::RightToLeft</enum>
+                  <enum>Qt::LeftToRight</enum>
                  </property>
                  <property name="text">
                   <string>Send reports after Tomahawk crashed</string>
@@ -383,6 +405,9 @@
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
+                   <property name="sizeType">
+                    <enum>QSizePolicy::Expanding</enum>
+                   </property>
                    <property name="sizeHint" stdset="0">
                     <size>
                      <width>40</width>