diff --git a/src/gui/optionsdlg.ui b/src/gui/optionsdlg.ui
index a47479300..2dad18c0c 100644
--- a/src/gui/optionsdlg.ui
+++ b/src/gui/optionsdlg.ui
@@ -671,33 +671,17 @@
              <x>0</x>
              <y>0</y>
              <width>586</width>
-             <height>1127</height>
+             <height>1118</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
             <item>
              <widget class="QGroupBox" name="torrentAdditionBox">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
               <property name="title">
                <string>When adding a torrent</string>
               </property>
-              <layout class="QGridLayout" name="gridLayout_5">
-               <property name="bottomMargin">
-                <number>9</number>
-               </property>
-               <item row="1" column="0">
-                <widget class="QCheckBox" name="checkStartPaused">
-                 <property name="text">
-                  <string comment="The torrent will be added to download list in pause state">Do not start the download automatically</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
+              <layout class="QVBoxLayout" name="torrentAdditionBoxLayout">
+               <item>
                 <widget class="QGroupBox" name="checkAdditionDialog">
                  <property name="title">
                   <string>Display torrent content and some options</string>
@@ -705,8 +689,11 @@
                  <property name="checkable">
                   <bool>true</bool>
                  </property>
-                 <layout class="QGridLayout" name="gridLayout_15">
-                  <item row="0" column="0">
+                 <layout class="QVBoxLayout" name="verticalLayout_18">
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
                    <widget class="QCheckBox" name="checkAdditionDialogFront">
                     <property name="text">
                      <string>Bring torrent dialog to the front</string>
@@ -719,7 +706,14 @@
                  </layout>
                 </widget>
                </item>
-               <item row="2" column="0">
+               <item>
+                <widget class="QCheckBox" name="checkStartPaused">
+                 <property name="text">
+                  <string comment="The torrent will be added to download list in pause state">Do not start the download automatically</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
                 <widget class="QGroupBox" name="deleteTorrentBox">
                  <property name="toolTip">
                   <string>Should the .torrent file be deleted after adding it</string>
@@ -733,7 +727,7 @@
                  <property name="checked">
                   <bool>false</bool>
                  </property>
-                 <layout class="QVBoxLayout" name="verticalLayout_17">
+                 <layout class="QVBoxLayout" name="deleteTorrentBoxLayout">
                   <item>
                    <widget class="QCheckBox" name="deleteCancelledTorrentBox">
                     <property name="toolTip">
@@ -745,7 +739,7 @@
                    </widget>
                   </item>
                   <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_11">
+                   <layout class="QHBoxLayout" name="deleteTorrentWarningLayout">
                     <item>
                      <widget class="QLabel" name="deleteTorrentWarningIcon">
                       <property name="sizePolicy">
@@ -761,12 +755,6 @@
                     </item>
                     <item>
                      <widget class="QLabel" name="deleteTorrentWarningLabel">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
                       <property name="text">
                        <string>Warning! Data loss possible!</string>
                       </property>
@@ -782,16 +770,10 @@
             </item>
             <item>
              <widget class="QGroupBox" name="groupSavingManagement">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
               <property name="title">
                <string>Saving Management</string>
               </property>
-              <layout class="QVBoxLayout" name="verticalLayout_25">
+              <layout class="QVBoxLayout" name="groupSavingManagementLayout">
                <item>
                 <layout class="QGridLayout" name="gridLayout_3">
                  <item row="0" column="0">