diff --git a/src/options.ui b/src/options.ui
index b3fb20869..14cd0548f 100644
--- a/src/options.ui
+++ b/src/options.ui
@@ -19,20 +19,11 @@
    <string>Options -- qBittorrent</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="bottomMargin" >
-    <number>9</number>
+   <property name="spacing" >
+    <number>6</number>
    </property>
    <item>
     <widget class="QLabel" name="lbl_title" >
@@ -87,60 +78,39 @@
        <string>Connection</string>
       </attribute>
       <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
        <item>
         <widget class="QGroupBox" name="groupMainConnec" >
          <property name="title" >
           <string>Main</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
-             <number>0</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <layout class="QVBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <property name="leftMargin" >
-               <number>0</number>
-              </property>
-              <property name="topMargin" >
+              <property name="margin" >
                <number>0</number>
               </property>
-              <property name="rightMargin" >
-               <number>0</number>
-              </property>
-              <property name="bottomMargin" >
-               <number>0</number>
+              <property name="spacing" >
+               <number>6</number>
               </property>
               <item>
                <widget class="QLabel" name="lbl_download" >
@@ -190,37 +160,19 @@
             </item>
             <item>
              <layout class="QVBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <property name="leftMargin" >
+              <property name="margin" >
                <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 name="spacing" >
+               <number>6</number>
               </property>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
+                <property name="margin" >
                  <number>0</number>
                 </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
-                 <number>0</number>
+                <property name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QSpinBox" name="spin_download" >
@@ -230,12 +182,12 @@
                   <property name="suffix" >
                    <string/>
                   </property>
-                  <property name="minimum" >
-                   <number>1</number>
-                  </property>
                   <property name="maximum" >
                    <number>1000000</number>
                   </property>
+                  <property name="minimum" >
+                   <number>1</number>
+                  </property>
                   <property name="value" >
                    <number>200</number>
                   </property>
@@ -281,20 +233,11 @@
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
+                <property name="margin" >
                  <number>0</number>
                 </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
-                 <number>0</number>
+                <property name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QSpinBox" name="spin_upload" >
@@ -304,12 +247,12 @@
                   <property name="suffix" >
                    <string/>
                   </property>
-                  <property name="minimum" >
-                   <number>1</number>
-                  </property>
                   <property name="maximum" >
                    <number>1000000</number>
                   </property>
+                  <property name="minimum" >
+                   <number>1</number>
+                  </property>
                   <property name="value" >
                    <number>10</number>
                   </property>
@@ -355,32 +298,23 @@
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
+                <property name="margin" >
                  <number>0</number>
                 </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
-                 <number>0</number>
+                <property name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QSpinBox" name="spin_max_connec" >
                   <property name="enabled" >
                    <bool>false</bool>
                   </property>
-                  <property name="minimum" >
-                   <number>1</number>
-                  </property>
                   <property name="maximum" >
                    <number>1000</number>
                   </property>
+                  <property name="minimum" >
+                   <number>1</number>
+                  </property>
                   <property name="value" >
                    <number>600</number>
                   </property>
@@ -429,29 +363,20 @@
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
+                <property name="margin" >
                  <number>0</number>
                 </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
-                 <number>0</number>
+                <property name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QSpinBox" name="spin_port_min" >
-                  <property name="minimum" >
-                   <number>1000</number>
-                  </property>
                   <property name="maximum" >
                    <number>65525</number>
                   </property>
+                  <property name="minimum" >
+                   <number>1000</number>
+                  </property>
                   <property name="value" >
                    <number>6881</number>
                   </property>
@@ -469,12 +394,12 @@
                 </item>
                 <item>
                  <widget class="QSpinBox" name="spin_port_max" >
-                  <property name="minimum" >
-                   <number>1000</number>
-                  </property>
                   <property name="maximum" >
                    <number>65525</number>
                   </property>
+                  <property name="minimum" >
+                   <number>1000</number>
+                  </property>
                   <property name="value" >
                    <number>6889</number>
                   </property>
@@ -497,20 +422,11 @@
               </item>
               <item>
                <layout class="QHBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
+                <property name="margin" >
                  <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 name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QLabel" name="label_11" >
@@ -530,12 +446,12 @@
                   <property name="decimals" >
                    <number>1</number>
                   </property>
-                  <property name="minimum" >
-                   <double>1.000000000000000</double>
-                  </property>
                   <property name="maximum" >
                    <double>99.900000000000006</double>
                   </property>
+                  <property name="minimum" >
+                   <double>1.000000000000000</double>
+                  </property>
                   <property name="singleStep" >
                    <double>0.100000000000000</double>
                   </property>
@@ -595,20 +511,11 @@
           <string>Peer eXchange (PeX)</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QCheckBox" name="disablePeX" >
@@ -622,26 +529,23 @@
        </item>
        <item>
         <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
          <item>
           <widget class="QGroupBox" name="groupMainDHT" >
            <property name="title" >
             <string>DHT (trackerless)</string>
            </property>
            <layout class="QVBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>9</number>
-            </property>
-            <property name="topMargin" >
-             <number>9</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>9</number>
             </property>
-            <property name="bottomMargin" >
-             <number>9</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QCheckBox" name="disableDHT" >
@@ -656,37 +560,19 @@
                <string>DHT configuration</string>
               </property>
               <layout class="QVBoxLayout" >
-               <property name="spacing" >
-                <number>6</number>
-               </property>
-               <property name="leftMargin" >
-                <number>9</number>
-               </property>
-               <property name="topMargin" >
+               <property name="margin" >
                 <number>9</number>
                </property>
-               <property name="rightMargin" >
-                <number>9</number>
-               </property>
-               <property name="bottomMargin" >
-                <number>9</number>
+               <property name="spacing" >
+                <number>6</number>
                </property>
                <item>
                 <layout class="QHBoxLayout" >
-                 <property name="spacing" >
-                  <number>6</number>
-                 </property>
-                 <property name="leftMargin" >
+                 <property name="margin" >
                   <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 name="spacing" >
+                  <number>6</number>
                  </property>
                  <item>
                   <widget class="QLabel" name="dhtPort_lbl" >
@@ -703,12 +589,12 @@
                      <height>0</height>
                     </size>
                    </property>
-                   <property name="minimum" >
-                    <number>1000</number>
-                   </property>
                    <property name="maximum" >
                     <number>65525</number>
                    </property>
+                   <property name="minimum" >
+                    <number>1000</number>
+                   </property>
                    <property name="value" >
                     <number>6881</number>
                    </property>
@@ -741,24 +627,27 @@
             <string>Encryption</string>
            </property>
            <layout class="QVBoxLayout" >
+            <property name="margin" >
+             <number>9</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
             <item>
              <layout class="QHBoxLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
+              <property name="spacing" >
+               <number>6</number>
+              </property>
               <item>
                <layout class="QVBoxLayout" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
+                <property name="margin" >
                  <number>0</number>
                 </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
-                 <number>0</number>
+                <property name="spacing" >
+                 <number>6</number>
                 </property>
                 <item>
                  <widget class="QLabel" name="lbl_encryption" >
@@ -835,20 +724,11 @@
        <string>Behaviour</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="bottomMargin" >
-        <number>9</number>
+       <property name="spacing" >
+        <number>6</number>
        </property>
        <item>
         <widget class="QGroupBox" name="groupTorrentAddition" >
@@ -856,20 +736,11 @@
           <string>Torrent addition</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QCheckBox" name="checkAdditionDialog" >
@@ -890,37 +761,19 @@
              <string>Default save path</string>
             </property>
             <layout class="QVBoxLayout" >
-             <property name="spacing" >
-              <number>6</number>
-             </property>
-             <property name="leftMargin" >
+             <property name="margin" >
               <number>9</number>
              </property>
-             <property name="topMargin" >
-              <number>9</number>
-             </property>
-             <property name="rightMargin" >
-              <number>9</number>
-             </property>
-             <property name="bottomMargin" >
-              <number>9</number>
+             <property name="spacing" >
+              <number>6</number>
              </property>
              <item>
               <layout class="QHBoxLayout" >
-               <property name="spacing" >
-                <number>6</number>
-               </property>
-               <property name="leftMargin" >
-                <number>0</number>
-               </property>
-               <property name="topMargin" >
+               <property name="margin" >
                 <number>0</number>
                </property>
-               <property name="rightMargin" >
-                <number>0</number>
-               </property>
-               <property name="bottomMargin" >
-                <number>0</number>
+               <property name="spacing" >
+                <number>6</number>
                </property>
                <item>
                 <widget class="QLabel" name="lbl_savePath" >
@@ -934,20 +787,11 @@
                </item>
                <item>
                 <layout class="QHBoxLayout" >
-                 <property name="spacing" >
-                  <number>6</number>
-                 </property>
-                 <property name="leftMargin" >
+                 <property name="margin" >
                   <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 name="spacing" >
+                  <number>6</number>
                  </property>
                  <item>
                   <widget class="QLineEdit" name="txt_savePath" >
@@ -979,20 +823,11 @@
           <string>Main window</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QCheckBox" name="confirmExit_checkBox" >
@@ -1037,20 +872,11 @@
           <string>Systray messages</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QRadioButton" name="alwaysOSD" >
@@ -1099,20 +925,11 @@
        <string>Language</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="bottomMargin" >
-        <number>9</number>
+       <property name="spacing" >
+        <number>6</number>
        </property>
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
@@ -1120,37 +937,19 @@
           <string>Localization</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
-             <number>0</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="lbl_icon_i18n" >
@@ -1234,20 +1033,11 @@
        <string>IP Filter</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="bottomMargin" >
-        <number>9</number>
+       <property name="spacing" >
+        <number>6</number>
        </property>
        <item>
         <widget class="QCheckBox" name="activateFilter" >
@@ -1265,20 +1055,11 @@
           <string>Filter Settings</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QTreeWidget" name="filtersList" >
@@ -1329,20 +1110,11 @@
           </item>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
-             <number>0</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <spacer>
@@ -1388,20 +1160,11 @@
           </item>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
-             <number>0</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="label_4" >
@@ -1432,20 +1195,11 @@
        <string>Proxy</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="bottomMargin" >
-        <number>9</number>
+       <property name="spacing" >
+        <number>6</number>
        </property>
        <item>
         <widget class="QCheckBox" name="enableProxy_checkBox" >
@@ -1463,37 +1217,19 @@
           <string>Proxy Settings</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="rightMargin" >
-             <number>0</number>
-            </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="lbl_ip" >
@@ -1562,20 +1298,11 @@
           </item>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
+            <property name="margin" >
              <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 name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="serverType_lbl" >
@@ -1629,54 +1356,27 @@
              <string>Authentication</string>
             </property>
             <layout class="QVBoxLayout" >
-             <property name="spacing" >
-              <number>6</number>
-             </property>
-             <property name="leftMargin" >
-              <number>9</number>
-             </property>
-             <property name="topMargin" >
+             <property name="margin" >
               <number>9</number>
              </property>
-             <property name="rightMargin" >
-              <number>9</number>
-             </property>
-             <property name="bottomMargin" >
-              <number>9</number>
+             <property name="spacing" >
+              <number>6</number>
              </property>
              <item>
               <layout class="QHBoxLayout" >
-               <property name="spacing" >
-                <number>6</number>
-               </property>
-               <property name="leftMargin" >
-                <number>0</number>
-               </property>
-               <property name="topMargin" >
-                <number>0</number>
-               </property>
-               <property name="rightMargin" >
+               <property name="margin" >
                 <number>0</number>
                </property>
-               <property name="bottomMargin" >
-                <number>0</number>
+               <property name="spacing" >
+                <number>6</number>
                </property>
                <item>
                 <layout class="QVBoxLayout" >
-                 <property name="spacing" >
-                  <number>6</number>
-                 </property>
-                 <property name="leftMargin" >
-                  <number>0</number>
-                 </property>
-                 <property name="topMargin" >
+                 <property name="margin" >
                   <number>0</number>
                  </property>
-                 <property name="rightMargin" >
-                  <number>0</number>
-                 </property>
-                 <property name="bottomMargin" >
-                  <number>0</number>
+                 <property name="spacing" >
+                  <number>6</number>
                  </property>
                  <item>
                   <widget class="QLabel" name="lbl_username" >
@@ -1696,20 +1396,11 @@
                </item>
                <item>
                 <layout class="QVBoxLayout" >
-                 <property name="spacing" >
-                  <number>6</number>
-                 </property>
-                 <property name="leftMargin" >
+                 <property name="margin" >
                   <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 name="spacing" >
+                  <number>6</number>
                  </property>
                  <item>
                   <widget class="QLineEdit" name="proxy_username" >
@@ -1844,20 +1535,11 @@
        <string>Misc</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
+       <property name="spacing" >
+        <number>6</number>
        </property>
        <item>
         <widget class="QGroupBox" name="groupScan" >
@@ -1865,20 +1547,11 @@
           <string>Directory scan</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QCheckBox" name="enableScan_checkBox" >
@@ -1889,20 +1562,11 @@
           </item>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="rightMargin" >
-             <number>0</number>
-            </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="lbl_scanDir" >
@@ -1919,20 +1583,11 @@
             </item>
             <item>
              <layout class="QHBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <property name="leftMargin" >
+              <property name="margin" >
                <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 name="spacing" >
+               <number>6</number>
               </property>
               <item>
                <widget class="QLineEdit" name="scanDir" >
@@ -1964,37 +1619,19 @@
           <string>Preview program</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <layout class="QHBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="leftMargin" >
-             <number>0</number>
-            </property>
-            <property name="topMargin" >
-             <number>0</number>
-            </property>
-            <property name="rightMargin" >
+            <property name="margin" >
              <number>0</number>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+            <property name="spacing" >
+             <number>6</number>
             </property>
             <item>
              <widget class="QLabel" name="lbl_preview" >
@@ -2024,20 +1661,11 @@
           <string>Style (Look 'n Feel)</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <widget class="QRadioButton" name="radioPlastiqueStyle" >
@@ -2112,20 +1740,11 @@
    </item>
    <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
+     <property name="margin" >
       <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 name="spacing" >
+      <number>6</number>
      </property>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox" >