diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 0b71c8547a44..c3e3c2d63b3c 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -22,10 +22,22 @@
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
     <widget class="QGroupBox" name="gbDim">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>284</height>
+       <height>250</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
      <property name="title">
@@ -33,8 +45,8 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,1">
-        <item row="6" column="2">
+       <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
+        <item row="4" column="2">
          <widget class="Gui::PrefLineEdit" name="leDiameter">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -64,7 +76,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="2" column="2">
          <widget class="Gui::PrefSpinBox" name="sbAltDecimals">
           <property name="enabled">
            <bool>false</bool>
@@ -117,7 +129,7 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="3" column="0">
          <widget class="QLabel" name="label_2">
           <property name="font">
            <font>
@@ -129,7 +141,7 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="2">
+        <item row="5" column="2">
          <widget class="Gui::PrefComboBox" name="pcbArrow">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -151,41 +163,13 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="2" column="0">
          <widget class="QLabel" name="label_11">
           <property name="text">
            <string>Alternate Decimals</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
-         <widget class="Gui::PrefLineEdit" name="leformatSpec">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Custom format for dimension text</string>
-          </property>
-          <property name="text">
-           <string>%.2f</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>formatSpec</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Dimensions</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="label_16">
           <property name="text">
@@ -193,7 +177,7 @@
           </property>
          </widget>
         </item>
-        <item row="8" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="label_12">
           <property name="font">
            <font>
@@ -205,7 +189,7 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="5" column="0">
          <widget class="QLabel" name="label_9">
           <property name="font">
            <font>
@@ -217,7 +201,7 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="2">
+        <item row="3" column="2">
          <widget class="Gui::PrefUnitSpinBox" name="plsb_FontSize">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -242,7 +226,7 @@
           </property>
          </widget>
         </item>
-        <item row="8" column="2">
+        <item row="6" column="2">
          <widget class="Gui::PrefUnitSpinBox" name="plsb_ArrowSize">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -267,18 +251,6 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_15">
-          <property name="font">
-           <font>
-            <italic>true</italic>
-           </font>
-          </property>
-          <property name="text">
-           <string>Default Format</string>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="2">
          <widget class="Gui::PrefComboBox" name="pcbStandardAndStyle">
           <property name="sizePolicy">
@@ -318,14 +290,14 @@
           </item>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="label_8">
           <property name="text">
            <string>Diameter Symbol</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="1">
+        <item row="3" column="1">
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -1308,8 +1280,8 @@
      <y>71</y>
     </hint>
     <hint type="destinationlabel">
-     <x>338</x>
-     <y>127</y>
+     <x>425</x>
+     <y>124</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp
index 746941693b78..624527ce47e4 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp
@@ -67,7 +67,6 @@ void DlgPrefsTechDraw3Imp::saveSettings()
     cbShowCenterMarks->onSave();
     cbShowUnits->onSave();
     leDiameter->onSave();
-    leformatSpec->onSave();
     leLineGroup->onSave();
     pcbArrow->onSave();
     pcbBalloonArrow->onSave();
@@ -106,7 +105,6 @@ void DlgPrefsTechDraw3Imp::loadSettings()
     cbShowCenterMarks->onRestore();
     cbShowUnits->onRestore();
     leDiameter->onRestore();
-    leformatSpec->onRestore();
     leLineGroup->onRestore();
     pcbArrow->onRestore();
     pcbBalloonArrow->onRestore();
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
index 060e4093a36d..399558154c9f 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
@@ -7,19 +7,63 @@
     <x>0</x>
     <y>0</y>
     <width>440</width>
-    <height>268</height>
+    <height>381</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Advanced</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
+   <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_17">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <italic>true</italic>
+      </font>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Box</enum>
+     </property>
+     <property name="text">
+      <string>Items in italics are default values for new objects.  They have no effect on existing objects.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" rowspan="2">
     <widget class="QGroupBox" name="gbDim">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>141</height>
+       <height>300</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
      <property name="title">
@@ -28,7 +72,7 @@
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
        <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,1">
-        <item row="4" column="2">
+        <item row="5" column="2">
          <widget class="Gui::PrefComboBox" name="cbEndCap">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -68,18 +112,35 @@ Only change unless you know what you are doing!</string>
           </item>
          </widget>
         </item>
-        <item row="2" column="1">
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="6" column="2">
+         <widget class="Gui::PrefSpinBox" name="sbMaxTiles">
+          <property name="toolTip">
+           <string>Limit of 64x64 pixel SVG tiles used to hatch a single face.
+For large scalings you might get an error about to many SVG tiles.
+Then you need to increase the tile limit.</string>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
           </property>
-         </spacer>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>1000000</number>
+          </property>
+          <property name="singleStep">
+           <number>100</number>
+          </property>
+          <property name="value">
+           <number>10000</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>MaxSVGTile</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Decorations</cstring>
+          </property>
+         </widget>
         </item>
         <item row="1" column="2">
          <widget class="Gui::PrefCheckBox" name="cbDebugDetail">
@@ -103,62 +164,44 @@ Only change unless you know what you are doing!</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="2">
-         <widget class="Gui::PrefSpinBox" name="sbMaxTiles">
+        <item row="3" column="0">
+         <widget class="Gui::PrefCheckBox" name="cbShowLoose">
           <property name="toolTip">
-           <string>Limit of 64x64 pixel SVG tiles used to hatch a single face.
-For large scalings you might get an error about to many SVG tiles.
-Then you need to increase the tile limit.</string>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>1000000</number>
-          </property>
-          <property name="singleStep">
-           <number>100</number>
+           <string>Include 2D Objects in projection</string>
           </property>
-          <property name="alignment">
-           <set>Qt::AlignRight</set>
+          <property name="text">
+           <string>Show Loose 2D Geom</string>
           </property>
-          <property name="value">
-           <number>10000</number>
+          <property name="checked">
+           <bool>false</bool>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>MaxSVGTile</cstring>
+           <cstring>ShowLoose2d</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/Decorations</cstring>
+           <cstring>Mod/TechDraw/General</cstring>
           </property>
          </widget>
         </item>
-        <item row="6" column="2">
-         <widget class="Gui::PrefSpinBox" name="sbMaxPat">
-          <property name="toolTip">
-           <string>Maximum hatch line segments to use
-when hatching a face with a PAT pattern</string>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>1000000</number>
-          </property>
-          <property name="singleStep">
-           <number>100</number>
+        <item row="1" column="0">
+         <widget class="Gui::PrefCheckBox" name="cbDebugSection">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-          <property name="alignment">
-           <set>Qt::AlignRight</set>
+          <property name="toolTip">
+           <string>Dump intermediate results during Section view processing</string>
           </property>
-          <property name="value">
-           <number>10000</number>
+          <property name="text">
+           <string>Debug Section</string>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>MaxSeg</cstring>
+           <cstring>debugSection</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/PAT</cstring>
+           <cstring>Mod/TechDraw/debug</cstring>
           </property>
          </widget>
         </item>
@@ -211,25 +254,44 @@ when hatching a face with a PAT pattern</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="Gui::PrefCheckBox" name="cbDebugSection">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
+        <item row="7" column="2">
+         <widget class="Gui::PrefSpinBox" name="sbMaxPat">
           <property name="toolTip">
-           <string>Dump intermediate results during Section view processing</string>
+           <string>Maximum hatch line segments to use
+when hatching a face with a PAT pattern</string>
           </property>
-          <property name="text">
-           <string>Debug Section</string>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>1000000</number>
+          </property>
+          <property name="singleStep">
+           <number>100</number>
+          </property>
+          <property name="value">
+           <number>10000</number>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>debugSection</cstring>
+           <cstring>MaxSeg</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/debug</cstring>
+           <cstring>Mod/TechDraw/PAT</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="font">
+           <font>
+            <italic>true</italic>
+           </font>
+          </property>
+          <property name="text">
+           <string>Line End Cap Shape</string>
           </property>
          </widget>
         </item>
@@ -261,31 +323,18 @@ can be a performance penalty in complex models.</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_7">
-          <property name="font">
-           <font>
-            <italic>true</italic>
-           </font>
-          </property>
-          <property name="text">
-           <string>Line End Cap Shape</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Max SVG Hatch Tiles</string>
+        <item row="2" column="1">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Max PAT Hatch Segments</string>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
           </property>
-         </widget>
+         </spacer>
         </item>
         <item row="2" column="0">
          <widget class="Gui::PrefCheckBox" name="cbCrazyEdges">
@@ -309,22 +358,45 @@ can be a performance penalty in complex models.</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
-         <widget class="Gui::PrefCheckBox" name="cbShowLoose">
-          <property name="toolTip">
-           <string>Include 2D Objects in projection</string>
+        <item row="6" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Max SVG Hatch Tiles</string>
           </property>
+         </widget>
+        </item>
+        <item row="7" column="0">
+         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>Show Loose 2D Geom</string>
+           <string>Max PAT Hatch Segments</string>
           </property>
-          <property name="checked">
-           <bool>false</bool>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="font">
+           <font>
+            <italic>true</italic>
+           </font>
+          </property>
+          <property name="text">
+           <string>Dimension Format</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2">
+         <widget class="Gui::PrefLineEdit" name="leFormatSpec">
+          <property name="toolTip">
+           <string>Override automatic dimension format</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>ShowLoose2d</cstring>
+           <cstring>formatSpec</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/General</cstring>
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
           </property>
          </widget>
         </item>
@@ -333,38 +405,6 @@ can be a performance penalty in complex models.</string>
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_17">
-     <property name="font">
-      <font>
-       <pointsize>12</pointsize>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="text">
-      <string>Items in italics are default values for new objects.  They have no effect on existing objects.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -383,6 +423,11 @@ can be a performance penalty in complex models.</string>
    <extends>QComboBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="Resources/TechDraw.qrc"/>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp
index 8ea42d7b5e3c..9725728ee473 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp
@@ -53,6 +53,7 @@ void DlgPrefsTechDraw4Imp::saveSettings()
     sbMaxTiles->onSave();
     sbMaxPat->onSave();
     cbShowLoose->onSave();
+    leFormatSpec->onSave();
 }
 
 void DlgPrefsTechDraw4Imp::loadSettings()
@@ -67,6 +68,7 @@ void DlgPrefsTechDraw4Imp::loadSettings()
     sbMaxTiles->onRestore();
     sbMaxPat->onRestore();
     cbShowLoose->onRestore();
+    leFormatSpec->onRestore();
 }
 
 /**