diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui
index d770d71c0c..7ebf313e48 100644
--- a/src/Gui/DlgGeneral.ui
+++ b/src/Gui/DlgGeneral.ui
@@ -193,12 +193,9 @@ dot/period will always be printed.</string>
     <item>
      <widget class="QGroupBox" name="GroupBox3">
       <property name="title">
-       <string>Main window</string>
+       <string>Application</string>
       </property>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
+      <layout class="QGridLayout">
        <property name="leftMargin">
         <number>11</number>
        </property>
@@ -211,239 +208,131 @@ dot/period will always be printed.</string>
        <property name="bottomMargin">
         <number>11</number>
        </property>
-       <item>
-        <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="styleSheetLabel">
+         <property name="text">
+          <string>Theme:</string>
          </property>
-         <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>
-         <item>
-          <widget class="QLabel" name="recentFileListLabel">
-           <property name="text">
-            <string>Size of recent file list:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="Gui::PrefSpinBox" name="RecentFiles">
-           <property name="toolTip">
-            <string>How many files should be listed in recent files list</string>
-           </property>
-           <property name="value">
-            <number>4</number>
-           </property>
-           <property name="prefEntry" stdset="0">
-            <cstring>RecentFiles</cstring>
-           </property>
-           <property name="prefPath" stdset="0">
-            <cstring>RecentFiles</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+        </widget>
        </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="StyleSheets">
+         <property name="toolTip">
+          <string>Style sheet how user interface will look like</string>
          </property>
-         <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>
-         <item>
-          <widget class="QCheckBox" name="tiledBackground">
-           <property name="toolTip">
-            <string>Background of the main window will consist of tiles of a special image.
-See the FreeCAD Wiki for details about the image.</string>
-           </property>
-           <property name="text">
-            <string>Enable tiled background</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="Gui::PrefCheckBox" name="EnableCursorBlinking">
-           <property name="toolTip">
-            <string>The text cursor will be blinking</string>
-           </property>
-           <property name="text">
-            <string>Enable cursor blinking</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-           <property name="prefEntry" stdset="0">
-            <cstring>EnableCursorBlinking</cstring>
-           </property>
-           <property name="prefPath" stdset="0">
-            <cstring>General</cstring>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        </widget>
        </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
+       <item row="1" column="0">
+        <widget class="QLabel" name="iconSizeLabel">
+         <property name="text">
+          <string>Size of toolbar icons:</string>
          </property>
-         <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>
-         <item>
-          <widget class="QLabel" name="styleSheetLabel">
-           <property name="text">
-            <string>Theme:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="StyleSheets">
-           <property name="toolTip">
-            <string>Style sheet how user interface will look like</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        </widget>
        </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">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="iconSizeLabel">
-           <property name="text">
-            <string>Size of toolbar icons:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="toolbarIconSize">
-           <property name="toolTip">
-            <string>Choose your preference for toolbar icon size. You can adjust
+       <item row="1" column="1">
+        <widget class="QComboBox" name="toolbarIconSize">
+         <property name="toolTip">
+          <string>Choose your preference for toolbar icon size. You can adjust
 this according to your screen size or personal taste</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         </property>
+        </widget>
        </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
+       <item row="2" column="0">
+        <widget class="QLabel" name="treeModeLabel">
+         <property name="text">
+          <string>Tree view mode:</string>
          </property>
-         <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>
-         <item>
-          <widget class="QLabel" name="treeModeLabel">
-           <property name="text">
-            <string>Tree view mode:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="treeMode">
-           <property name="toolTip">
-            <string>Customize how tree view is shown in the panel (restart required).
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QComboBox" name="treeMode">
+         <property name="toolTip">
+          <string>Customize how tree view is shown in the panel (restart required).
 
 'ComboView': combine tree view and property view into one panel.
 'TreeView and PropertyView': split tree view and property view into separate panel.
 'Both': keep all three panels, and you can have two sets of tree view and property view.</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         </property>
+        </widget>
        </item>
-      </layout>
-     </widget>
-    </item>
-    <item>
-     <widget class="Gui::PrefCheckBox" name="SplashScreen">
-      <property name="toolTip">
-       <string>A Splash screen is a small loading window that is shown
+       <item row="3" column="0">
+        <widget class="QLabel" name="recentFileListLabel">
+         <property name="text">
+          <string>Size of recent file list:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="Gui::PrefSpinBox" name="RecentFiles">
+         <property name="toolTip">
+          <string>How many files should be listed in recent files list</string>
+         </property>
+         <property name="value">
+          <number>4</number>
+         </property>
+         <property name="prefEntry" stdset="0">
+          <cstring>RecentFiles</cstring>
+         </property>
+         <property name="prefPath" stdset="0">
+          <cstring>RecentFiles</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="tiledBackground">
+         <property name="toolTip">
+          <string>Background of the main window will consist of tiles of a special image.
+See the FreeCAD Wiki for details about the image.</string>
+         </property>
+         <property name="text">
+          <string>Enable tiled background</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="Gui::PrefCheckBox" name="EnableCursorBlinking">
+         <property name="toolTip">
+          <string>The text cursor will be blinking</string>
+         </property>
+         <property name="text">
+          <string>Enable cursor blinking</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <property name="prefEntry" stdset="0">
+          <cstring>EnableCursorBlinking</cstring>
+         </property>
+         <property name="prefPath" stdset="0">
+          <cstring>General</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="Gui::PrefCheckBox" name="SplashScreen">
+         <property name="toolTip">
+          <string>A Splash screen is a small loading window that is shown
 when FreeCAD is launching. If this option is checked, FreeCAD will
 display the splash screen</string>
-      </property>
-      <property name="text">
-       <string>Enable splash screen at start up</string>
-      </property>
-      <property name="checked">
-       <bool>true</bool>
-      </property>
-      <property name="prefEntry" stdset="0">
-       <cstring>ShowSplasher</cstring>
-      </property>
-      <property name="prefPath" stdset="0">
-       <cstring>General</cstring>
-      </property>
+         </property>
+         <property name="text">
+          <string>Enable splash screen at start up</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+         <property name="prefEntry" stdset="0">
+          <cstring>ShowSplasher</cstring>
+         </property>
+         <property name="prefPath" stdset="0">
+          <cstring>General</cstring>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </item>
     <item>