diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
index b38b000983..5f11e09dc2 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -597,25 +597,6 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="dsb_LabelSize">
-          <property name="toolTip">
-           <string>Label height in millimeters</string>
-          </property>
-          <property name="minimum">
-           <double>0.100000000000000</double>
-          </property>
-          <property name="value">
-           <double>5.000000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>LabelSize</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Labels</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="lbl_LabelFont">
           <property name="text">
@@ -655,22 +636,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="dsb_TemplateDot">
-          <property name="toolTip">
-           <string>EditableText Dot Size in mm</string>
-          </property>
-          <property name="value">
-           <double>3.000000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>TemplateDotSize</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/General</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="1">
          <spacer name="horizontalSpacer_6">
           <property name="orientation">
@@ -697,6 +662,38 @@
           </property>
          </spacer>
         </item>
+        <item row="1" column="2">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_LabelSize">
+          <property name="toolTip">
+           <string>View Label size in units</string>
+          </property>
+          <property name="value">
+           <double>3.500000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>LabelSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Labels</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_TemplateDot">
+          <property name="toolTip">
+           <string>Green edit dot size in units</string>
+          </property>
+          <property name="value">
+           <double>3.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateDotSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -736,6 +733,11 @@
    <extends>QWidget</extends>
    <header>Gui/FileDialog.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::QuantitySpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/QuantitySpinBox.h</header>
+  </customwidget>
   <customwidget>
    <class>Gui::ColorButton</class>
    <extends>QPushButton</extends>
@@ -767,13 +769,13 @@
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
   <customwidget>
-   <class>Gui::PrefDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
+   <class>Gui::PrefFontBox</class>
+   <extends>QFontComboBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
   <customwidget>
-   <class>Gui::PrefFontBox</class>
-   <extends>QFontComboBox</extends>
+   <class>Gui::PrefUnitSpinBox</class>
+   <extends>Gui::QuantitySpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
index 118208132c..eb1b9e31e6 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
@@ -22,29 +22,6 @@
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
        <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
-        <item row="6" column="0">
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Arrow Style</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="Gui::PrefSpinBox" name="sbAltDecimals">
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="value">
-           <number>2</number>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>AltDecimals</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Dimensions</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="Gui::PrefCheckBox" name="cbShowUnits">
           <property name="text">
@@ -65,6 +42,23 @@
           </property>
          </widget>
         </item>
+        <item row="4" column="2">
+         <widget class="Gui::PrefColorButton" name="colDimColor">
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>Color</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
         <item row="3" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -85,39 +79,17 @@
           </property>
          </spacer>
         </item>
-        <item row="3" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="dsbFontSize">
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="decimals">
-           <number>1</number>
-          </property>
-          <property name="value">
-           <double>3.500000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>FontSize</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Dimensions</cstring>
+        <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::PrefColorButton" name="colDimColor">
-          <property name="color">
-           <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>Color</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Dimensions</cstring>
+        <item row="7" column="0">
+         <widget class="QLabel" name="label_12">
+          <property name="text">
+           <string>Arrow Size</string>
           </property>
          </widget>
         </item>
@@ -149,13 +121,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_11">
-          <property name="text">
-           <string>Alternate Decimals</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="Gui::PrefCheckBox" name="cbGlobalDecimals">
           <property name="text">
@@ -241,17 +206,49 @@
           </item>
          </widget>
         </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_12">
+        <item row="6" column="0">
+         <widget class="QLabel" name="label_9">
           <property name="text">
-           <string>Arrow Size</string>
+           <string>Arrow Style</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefSpinBox" name="sbAltDecimals">
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="value">
+           <number>2</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>AltDecimals</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_FontSize">
+          <property name="toolTip">
+           <string>Dimension font size in units</string>
+          </property>
+          <property name="value">
+           <double>3.500000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FontSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
           </property>
          </widget>
         </item>
         <item row="7" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="dsbArrowSize">
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_ArrowSize">
+          <property name="toolTip">
+           <string>Dimension arrowhead size in units</string>
           </property>
           <property name="value">
            <double>3.500000000000000</double>
@@ -506,6 +503,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>Gui::QuantitySpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/QuantitySpinBox.h</header>
+  </customwidget>
   <customwidget>
    <class>Gui::ColorButton</class>
    <extends>QPushButton</extends>
@@ -537,8 +539,8 @@
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
   <customwidget>
-   <class>Gui::PrefDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
+   <class>Gui::PrefUnitSpinBox</class>
+   <extends>Gui::QuantitySpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
  </customwidgets>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
index d46779b1d4..57e9332d79 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
@@ -34,6 +34,8 @@ DlgPrefsTechDraw2Imp::DlgPrefsTechDraw2Imp( QWidget* parent )
   : PreferencePage( parent )
 {
     this->setupUi(this);
+    plsb_FontSize->setUnit(Base::Unit::Length);
+    plsb_ArrowSize->setUnit(Base::Unit::Length);
 }
 
 DlgPrefsTechDraw2Imp::~DlgPrefsTechDraw2Imp()
@@ -44,7 +46,7 @@ DlgPrefsTechDraw2Imp::~DlgPrefsTechDraw2Imp()
 void DlgPrefsTechDraw2Imp::saveSettings()
 {
     cbShowUnits->onSave();
-    dsbFontSize->onSave();
+    plsb_FontSize->onSave();
     colDimColor->onSave();
     leDiameter->onSave();
     pcbMatting->onSave();
@@ -55,14 +57,14 @@ void DlgPrefsTechDraw2Imp::saveSettings()
     pcbArrow->onSave();
     cbGlobalDecimals->onSave();
     sbAltDecimals->onSave();
-    dsbArrowSize->onSave();
+    plsb_ArrowSize->onSave();
     leLineGroup->onSave();
 }
 
 void DlgPrefsTechDraw2Imp::loadSettings()
 {
     cbShowUnits->onRestore();
-    dsbFontSize->onRestore();
+    plsb_FontSize->onRestore();
     colDimColor->onRestore();
     leDiameter->onRestore();
     pcbMatting->onRestore();
@@ -73,7 +75,7 @@ void DlgPrefsTechDraw2Imp::loadSettings()
     pcbArrow->onRestore();
     cbGlobalDecimals->onRestore();
     sbAltDecimals->onRestore();
-    dsbArrowSize->onRestore();
+    plsb_ArrowSize->onRestore();
     leLineGroup->onRestore();
 }
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
index 1c53fc7237..879a8786e9 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
@@ -34,6 +34,8 @@ DlgPrefsTechDrawImp::DlgPrefsTechDrawImp( QWidget* parent )
   : PreferencePage( parent )
 {
     this->setupUi(this);
+    plsb_LabelSize->setUnit(Base::Unit::Length);
+    plsb_TemplateDot->setUnit(Base::Unit::Length);
 }
 
 DlgPrefsTechDrawImp::~DlgPrefsTechDrawImp()
@@ -48,7 +50,6 @@ void DlgPrefsTechDrawImp::saveSettings()
     cb_Faces->onSave();
     cb_SectionEdges->onSave();
     cb_PageUpdate->onSave();
-    dsb_TemplateDot->onSave();
 
     pcb_Normal->onSave();
     pcb_Select->onSave();
@@ -59,7 +60,8 @@ void DlgPrefsTechDrawImp::saveSettings()
     pcb_Hatch->onSave();
 
     pfb_LabelFont->onSave();
-    dsb_LabelSize->onSave();
+    plsb_LabelSize->onSave();
+    plsb_TemplateDot->onSave();
 
     pfc_DefTemp->onSave();
     pfc_DefDir->onSave();
@@ -75,7 +77,6 @@ void DlgPrefsTechDrawImp::loadSettings()
     cb_Faces->onRestore();
     cb_SectionEdges->onRestore();
     cb_PageUpdate->onRestore();
-    dsb_TemplateDot->onRestore();
 
     pcb_Normal->onRestore();
     pcb_Select->onRestore();
@@ -86,7 +87,8 @@ void DlgPrefsTechDrawImp::loadSettings()
     pcb_Hatch->onRestore();
 
     pfb_LabelFont->onRestore();
-    dsb_LabelSize->onRestore();
+    plsb_LabelSize->onRestore();
+    plsb_TemplateDot->onRestore();
 
     pfc_DefTemp->onRestore();
     pfc_DefDir->onRestore();