diff --git a/src/Gui/DlgSettingsDocument.ui b/src/Gui/DlgSettingsDocument.ui
index 4c232526bf..1a007a8c21 100644
--- a/src/Gui/DlgSettingsDocument.ui
+++ b/src/Gui/DlgSettingsDocument.ui
@@ -7,26 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>607</width>
-    <height>820</height>
+    <height>859</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Document</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="4" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>429</width>
-       <height>37</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="GroupBox5">
      <property name="title">
@@ -48,6 +35,38 @@
       <property name="spacing">
        <number>6</number>
       </property>
+      <item row="0" column="0">
+       <widget class="Gui::PrefCheckBox" name="prefCheckNewDoc">
+        <property name="toolTip">
+         <string>The application will create a new document when started</string>
+        </property>
+        <property name="text">
+         <string>Create new document at start up</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>CreateNewDoc</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Document</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="Line" name="line1">
+        <property name="frameShape">
+         <enum>QFrame::HLine</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <layout class="QHBoxLayout">
         <property name="spacing">
@@ -91,6 +110,38 @@
         </item>
        </layout>
       </item>
+      <item row="3" column="0">
+       <widget class="Line" name="line1_2">
+        <property name="frameShape">
+         <enum>QFrame::HLine</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="Gui::PrefCheckBox" name="prefUndoRedo">
+        <property name="toolTip">
+         <string>All changes in documents are stored so that they can be undone/redone</string>
+        </property>
+        <property name="text">
+         <string>Using Undo/Redo on documents</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="prefEntry" stdset="0">
+         <cstring>UsingUndo</cstring>
+        </property>
+        <property name="prefPath" stdset="0">
+         <cstring>Document</cstring>
+        </property>
+       </widget>
+      </item>
       <item row="5" column="0">
        <layout class="QHBoxLayout">
         <property name="spacing">
@@ -133,70 +184,6 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="0">
-       <widget class="Gui::PrefCheckBox" name="prefCheckNewDoc">
-        <property name="toolTip">
-         <string>The application will create a new document when started</string>
-        </property>
-        <property name="text">
-         <string>Create new document at start up</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>CreateNewDoc</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Document</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="Line" name="line1">
-        <property name="frameShape">
-         <enum>QFrame::HLine</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="Line" name="line1_2">
-        <property name="frameShape">
-         <enum>QFrame::HLine</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="Gui::PrefCheckBox" name="prefUndoRedo">
-        <property name="toolTip">
-         <string>All changes in documents are stored so that they can be undone/redone</string>
-        </property>
-        <property name="text">
-         <string>Using Undo/Redo on documents</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>UsingUndo</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Document</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="6" column="0">
        <widget class="Line" name="line">
         <property name="orientation">
@@ -341,33 +328,26 @@ automatically run a file recovery when it is started.</string>
        </widget>
       </item>
       <item row="5" column="0">
-       <widget class="Gui::PrefCheckBox" name="prefSaveThumbnail">
-        <property name="toolTip">
-         <string>A thumbnail will be stored when document is saved</string>
-        </property>
-        <property name="text">
-         <string>Save thumbnail into project file when saving document</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>SaveThumbnail</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Document</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <property name="leftMargin">
-         <number>5</number>
+         <number>0</number>
         </property>
         <property name="topMargin">
-         <number>6</number>
+         <number>0</number>
         </property>
         <item>
-         <widget class="QLabel" name="label_6">
+         <widget class="Gui::PrefCheckBox" name="prefSaveThumbnail">
+          <property name="toolTip">
+           <string>A thumbnail will be stored when document is saved</string>
+          </property>
           <property name="text">
-           <string>Size of thumbnail</string>
+           <string>Save thumbnail into project file when saving document</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>SaveThumbnail</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Document</cstring>
           </property>
          </widget>
         </item>
@@ -387,8 +367,18 @@ automatically run a file recovery when it is started.</string>
           </property>
          </spacer>
         </item>
+        <item>
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Size</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="Gui::PrefSpinBox" name="prefThumbnailSize">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="toolTip">
            <string>Sets the size of the thumbnail that is stored in the document.
 Common sizes are 128, 256 and 512</string>
@@ -399,6 +389,9 @@ Common sizes are 128, 256 and 512</string>
           <property name="maximum">
            <number>512</number>
           </property>
+          <property name="value">
+           <number>128</number>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>ThumbnailSize</cstring>
           </property>
@@ -409,7 +402,7 @@ Common sizes are 128, 256 and 512</string>
         </item>
        </layout>
       </item>
-      <item row="7" column="0">
+      <item row="6" column="0">
        <widget class="Gui::PrefCheckBox" name="prefAddLogo">
         <property name="toolTip">
          <string>The program logo will be added to the thumbnail</string>
@@ -428,7 +421,7 @@ Common sizes are 128, 256 and 512</string>
         </property>
        </widget>
       </item>
-      <item row="8" column="0">
+      <item row="7" column="0">
        <layout class="QHBoxLayout">
         <property name="spacing">
          <number>6</number>
@@ -495,7 +488,7 @@ Common sizes are 128, 256 and 512</string>
         </item>
        </layout>
       </item>
-      <item row="9" column="0">
+      <item row="8" column="0">
        <layout class="QHBoxLayout">
         <property name="spacing">
          <number>6</number>
@@ -768,18 +761,31 @@ You can also use the form: John Doe &lt;john@doe.com&gt;</string>
      </layout>
     </widget>
    </item>
+   <item row="4" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>429</width>
+       <height>37</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>Gui::PrefSpinBox</class>
-   <extends>QSpinBox</extends>
+   <class>Gui::PrefCheckBox</class>
+   <extends>QCheckBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
   <customwidget>
-   <class>Gui::PrefCheckBox</class>
-   <extends>QCheckBox</extends>
+   <class>Gui::PrefSpinBox</class>
+   <extends>QSpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
   <customwidget>
@@ -793,15 +799,6 @@ You can also use the form: John Doe &lt;john@doe.com&gt;</string>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>prefCheckNewDoc</tabstop>
-  <tabstop>prefCompression</tabstop>
-  <tabstop>prefUndoRedo</tabstop>
-  <tabstop>prefUndoRedoSize</tabstop>
-  <tabstop>prefSaveTransaction</tabstop>
-  <tabstop>prefDiscardTransaction</tabstop>
-  <tabstop>prefSaveThumbnail</tabstop>
- </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -811,12 +808,12 @@ You can also use the form: John Doe &lt;john@doe.com&gt;</string>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>128</x>
-     <y>486</y>
+     <x>150</x>
+     <y>525</y>
     </hint>
     <hint type="destinationlabel">
      <x>584</x>
-     <y>488</y>
+     <y>527</y>
     </hint>
    </hints>
   </connection>
@@ -843,12 +840,12 @@ You can also use the form: John Doe &lt;john@doe.com&gt;</string>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>258</x>
-     <y>474</y>
+     <x>280</x>
+     <y>525</y>
     </hint>
     <hint type="destinationlabel">
-     <x>182</x>
-     <y>519</y>
+     <x>204</x>
+     <y>559</y>
     </hint>
    </hints>
   </connection>
@@ -859,12 +856,28 @@ You can also use the form: John Doe &lt;john@doe.com&gt;</string>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>304</x>
-     <y>477</y>
+     <x>326</x>
+     <y>525</y>
     </hint>
     <hint type="destinationlabel">
-     <x>380</x>
-     <y>499</y>
+     <x>584</x>
+     <y>560</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>prefSaveThumbnail</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>prefThumbnailSize</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>313</x>
+     <y>412</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>398</x>
+     <y>452</y>
     </hint>
    </hints>
   </connection>