diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
index 534961ad5f..837e53c4a9 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
@@ -120,8 +120,8 @@ can override the global 'Update With 3D' parameter</string>
            </font>
           </property>
           <property name="toolTip">
-           <string>Update pages as scheduled or skip updates.
-Checked is the default for new pages.</string>
+           <string>Keep drawing pages in sync with changes of 3D model in real time.
+This can slow down the response time.</string>
           </property>
           <property name="text">
            <string>Keep Page Up To Date</string>
@@ -196,8 +196,8 @@ for ProjectionGroups</string>
      <property name="title">
       <string>Colors</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_5">
-      <item row="0" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="lbl_Normal">
@@ -366,34 +366,22 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="2" column="3">
-         <widget class="QLabel" name="label_5">
-          <property name="font">
-           <font>
-            <italic>true</italic>
-           </font>
-          </property>
+         <widget class="QLabel" name="label_14">
           <property name="text">
-           <string>Section Hatch</string>
+           <string>Section Line</string>
           </property>
          </widget>
         </item>
         <item row="2" column="4">
-         <widget class="Gui::PrefColorButton" name="pcb_Hatch">
+         <widget class="Gui::PrefColorButton" name="pcbSectionLine">
           <property name="toolTip">
-           <string>Section face hatch color</string>
-          </property>
-          <property name="color">
-           <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
+           <string>Section line color</string>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>Hatch</cstring>
+           <cstring>SectionColor</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Colors</cstring>
+           <cstring>/Mod/TechDraw/Decorations</cstring>
           </property>
          </widget>
         </item>
@@ -412,7 +400,7 @@ for ProjectionGroups</string>
         <item row="3" column="1">
          <widget class="Gui::PrefColorButton" name="pcb_Background">
           <property name="toolTip">
-           <string>Window background color</string>
+           <string>Background color around pages</string>
           </property>
           <property name="color">
            <color>
@@ -430,21 +418,21 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="3" column="3">
-         <widget class="QLabel" name="label_7">
+         <widget class="QLabel" name="label_5">
           <property name="font">
            <font>
             <italic>true</italic>
            </font>
           </property>
           <property name="text">
-           <string>Geometric Hatch</string>
+           <string>Hatch</string>
           </property>
          </widget>
         </item>
         <item row="3" column="4">
-         <widget class="Gui::PrefColorButton" name="pcb_GeomHatch">
+         <widget class="Gui::PrefColorButton" name="pcb_Hatch">
           <property name="toolTip">
-           <string>Geometric hatch color</string>
+           <string>Hatch image color</string>
           </property>
           <property name="color">
            <color>
@@ -454,7 +442,7 @@ for ProjectionGroups</string>
            </color>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>GeomHatch</cstring>
+           <cstring>Hatch</cstring>
           </property>
           <property name="prefPath" stdset="0">
            <cstring>/Mod/TechDraw/Colors</cstring>
@@ -471,7 +459,7 @@ for ProjectionGroups</string>
         <item row="4" column="1">
          <widget class="Gui::PrefColorButton" name="pcbDimColor">
           <property name="toolTip">
-           <string>Color of Dimension lines and text.</string>
+           <string>Color of dimension lines and text.</string>
           </property>
           <property name="color">
            <color>
@@ -489,31 +477,49 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="4" column="3">
-         <widget class="QLabel" name="label_14">
+         <widget class="QLabel" name="label_7">
+          <property name="font">
+           <font>
+            <italic>true</italic>
+           </font>
+          </property>
           <property name="text">
-           <string>Section Line</string>
+           <string>Geometric Hatch</string>
           </property>
          </widget>
         </item>
         <item row="4" column="4">
-         <widget class="Gui::PrefColorButton" name="pcbSectionLine">
+         <widget class="Gui::PrefColorButton" name="pcb_GeomHatch">
+          <property name="toolTip">
+           <string>Geometric hatch pattern color</string>
+          </property>
+          <property name="color" stdset="0">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
           <property name="prefEntry" stdset="0">
-           <cstring>SectionColor</cstring>
+           <cstring>GeomHatch</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Decorations</cstring>
+           <cstring>/Mod/TechDraw/Colors</cstring>
           </property>
          </widget>
         </item>
         <item row="5" column="0">
          <widget class="QLabel" name="label_15">
           <property name="text">
-           <string>Center Line</string>
+           <string>Centerline</string>
           </property>
          </widget>
         </item>
         <item row="5" column="1">
          <widget class="Gui::PrefColorButton" name="pcbCenterColor">
+          <property name="toolTip">
+           <string>Centerline color</string>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>CenterColor</cstring>
           </property>
@@ -531,6 +537,9 @@ for ProjectionGroups</string>
         </item>
         <item row="5" column="4">
          <widget class="Gui::PrefColorButton" name="pcbVertexColor">
+          <property name="toolTip">
+           <string>Color of vertices in views</string>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>VertexColor</cstring>
           </property>
@@ -547,7 +556,7 @@ for ProjectionGroups</string>
            </font>
           </property>
           <property name="toolTip">
-           <string>Transparent faces if checked</string>
+           <string>Object faces will be transparent</string>
           </property>
           <property name="text">
            <string>Transparent Faces</string>
@@ -588,14 +597,14 @@ for ProjectionGroups</string>
            </font>
           </property>
           <property name="text">
-           <string>Markups</string>
+           <string>Leaderline</string>
           </property>
          </widget>
         </item>
         <item row="6" column="4">
          <widget class="Gui::PrefColorButton" name="pcbMarkup">
           <property name="toolTip">
-           <string>Default color for annotations </string>
+           <string>Default color for leader lines </string>
           </property>
           <property name="color">
            <color>
@@ -743,6 +752,9 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Label size</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
           <property name="value">
            <double>8.000000000000000</double>
           </property>
@@ -802,7 +814,7 @@ for ProjectionGroups</string>
           </property>
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -847,7 +859,7 @@ for ProjectionGroups</string>
          <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -879,7 +891,7 @@ for ProjectionGroups</string>
            </font>
           </property>
           <property name="text">
-           <string>SVG Hatch Pattern</string>
+           <string>Hatch Pattern File</string>
           </property>
          </widget>
         </item>
@@ -887,7 +899,7 @@ for ProjectionGroups</string>
          <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -924,7 +936,7 @@ for ProjectionGroups</string>
          <widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -961,7 +973,7 @@ for ProjectionGroups</string>
          <widget class="Gui::PrefFileChooser" name="pfc_Welding">
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -1001,7 +1013,7 @@ for ProjectionGroups</string>
          <widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>0</height>
            </size>
           </property>
@@ -1044,7 +1056,7 @@ for ProjectionGroups</string>
           </property>
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>191</width>
             <height>22</height>
            </size>
           </property>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
index 78220d2496..ab958d60a1 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
@@ -251,57 +251,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,1">
-        <property name="horizontalSpacing">
-         <number>24</number>
-        </property>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>OverLap Radius (TBI)</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="pdsbOverlapRadius">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>0</width>
-            <height>33</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Area to be inspected for overlap object selection. (not implemented yet)</string>
-          </property>
-          <property name="statusTip">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="value">
-           <double>20.000000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>OverlapRadius</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/General</cstring>
-          </property>
-         </widget>
-        </item>
+       <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
          <widget class="QLabel" name="label_3">
           <property name="minimumSize">
@@ -321,12 +271,18 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Mark Fuzz</string>
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-         </widget>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
         </item>
         <item row="0" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="pdsbEdgeFuzz">
@@ -338,7 +294,7 @@
           </property>
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>174</width>
             <height>0</height>
            </size>
           </property>
@@ -368,6 +324,13 @@
           </property>
          </widget>
         </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Mark Fuzz</string>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="pdsbMarkFuzz">
           <property name="sizePolicy">
@@ -378,7 +341,7 @@
           </property>
           <property name="minimumSize">
            <size>
-            <width>0</width>
+            <width>174</width>
             <height>0</height>
            </size>
           </property>
@@ -408,24 +371,81 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Overlap Radius</string>
           </property>
-          <property name="sizeHint" stdset="0">
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="pdsbOverlapRadius">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
            <size>
-            <width>40</width>
-            <height>20</height>
+            <width>174</width>
+            <height>0</height>
            </size>
           </property>
-         </spacer>
+          <property name="baseSize">
+           <size>
+            <width>0</width>
+            <height>33</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Area to be inspected for overlap object selection.
+(not implemented yet)</string>
+          </property>
+          <property name="statusTip">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="value">
+           <double>20.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>OverlapRadius</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_12">
+     <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">
     <widget class="QGroupBox" name="gb_SizeAdj">
      <property name="sizePolicy">
@@ -443,9 +463,75 @@
      <property name="title">
       <string>Size Adjustments</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,0,1">
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Vertex Scale</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="pdsbVertexScale">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>174</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Scale of vertex dots. Multiplier of line width.</string>
+          </property>
+          <property name="accessibleName">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="value">
+           <double>5.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>VertexScale</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="font">
+           <font>
+            <italic>true</italic>
+           </font>
+          </property>
+          <property name="text">
+           <string>Center Mark Scale</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item row="1" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="pdsbCenterScale">
           <property name="sizePolicy">
@@ -454,8 +540,14 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="minimumSize">
+           <size>
+            <width>174</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
-           <string>Size of center marks.  Multiplier of vertex size.</string>
+           <string>Size of center marks. Multiplier of vertex size.</string>
           </property>
           <property name="accessibleName">
            <string/>
@@ -474,65 +566,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="pdsbToleranceScale">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Tolerance font size adjustment.  Multiplier of dimension font size.</string>
-          </property>
-          <property name="accessibleName">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="value">
-           <double>0.500000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>TolSizeAdjust</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">
-          <property name="text">
-           <string>Vertex Scale</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="font">
-           <font>
-            <italic>true</italic>
-           </font>
-          </property>
-          <property name="text">
-           <string>Center Mark Scale</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="0">
          <widget class="QLabel" name="lbl_LabelFont">
           <property name="minimumSize">
@@ -557,23 +590,28 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Template Edit Mark</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="pdsbVertexScale">
+        <item row="2" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="pdsbToleranceScale">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="minimumSize">
+           <size>
+            <width>174</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="baseSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="toolTip">
-           <string>Scale of vertex dots.  Multiplier of line width.</string>
+           <string>Tolerance font size adjustment. Multiplier of dimension font size.</string>
           </property>
           <property name="accessibleName">
            <string/>
@@ -582,18 +620,25 @@
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="value">
-           <double>5.000000000000000</double>
+           <double>0.500000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>VertexScale</cstring>
+           <cstring>TolSizeAdjust</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/General</cstring>
+           <cstring>Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>Template Edit Mark</string>
           </property>
          </widget>
         </item>
         <item row="3" column="2">
-         <widget class="Gui::PrefUnitSpinBox" name="pdsbTemplateMark" native="true">
+         <widget class="Gui::PrefUnitSpinBox" name="pdsbTemplateMark">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -609,6 +654,9 @@
           <property name="toolTip">
            <string>Size of template field click handles</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
           <property name="value" stdset="0">
            <double>3.000000000000000</double>
           </property>
@@ -620,43 +668,11 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_12">
-     <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="4" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
index 1279b7b5f0..d0525f7517 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui
@@ -228,7 +228,10 @@
           <property name="toolTip">
            <string>Dimension text font size</string>
           </property>
-          <property name="value">
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
+          <property name="value" stdset="0">
            <double>4.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
@@ -250,7 +253,10 @@
           <property name="toolTip">
            <string>Arrowhead size</string>
           </property>
-          <property name="value">
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
+          <property name="value" stdset="0">
            <double>5.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
@@ -393,7 +399,7 @@
            </font>
           </property>
           <property name="text">
-           <string>Matting Style</string>
+           <string>Detail View Outline Shape</string>
           </property>
          </widget>
         </item>
@@ -675,31 +681,55 @@
            <property name="text">
             <string>NeverShow</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/arrownone.svg</normaloff>:/icons/arrownone.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Continuous</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/continuous-line.svg</normaloff>:/icons/continuous-line.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Dash</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/dash-line.svg</normaloff>:/icons/dash-line.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>Dot</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/dot-line.svg</normaloff>:/icons/dot-line.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>DashDot</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/dashDot-line.svg</normaloff>:/icons/dashDot-line.svg</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
             <string>DashDotDot</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/dashDotDot-line.svg</normaloff>:/icons/dashDotDot-line.svg</iconset>
+           </property>
           </item>
          </widget>
         </item>
@@ -829,13 +859,21 @@
           </property>
           <item>
            <property name="text">
-            <string>Round</string>
+            <string>Circle</string>
+           </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/circular.svg</normaloff>:/icons/circular.svg</iconset>
            </property>
           </item>
           <item>
            <property name="text">
             <string>Square</string>
            </property>
+           <property name="icon">
+            <iconset resource="Resources/TechDraw.qrc">
+             <normaloff>:/icons/square.svg</normaloff>:/icons/square.svg</iconset>
+           </property>
           </item>
          </widget>
         </item>
@@ -1119,11 +1157,6 @@
    <extends>QLineEdit</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::PrefUnitSpinBox</class>
    <extends>Gui::QuantitySpinBox</extends>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
index 905c692f2b..060e4093a3 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
@@ -119,6 +119,9 @@ Then you need to increase the tile limit.</string>
           <property name="singleStep">
            <number>100</number>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
           <property name="value">
            <number>10000</number>
           </property>
@@ -145,6 +148,9 @@ when hatching a face with a PAT pattern</string>
           <property name="singleStep">
            <number>100</number>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
           <property name="value">
            <number>10000</number>
           </property>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw5.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw5.ui
index a94633d624..3e5df3bc9d 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw5.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw5.ui
@@ -357,9 +357,18 @@ Fast, but result is a collection of short straight lines.</string>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="maximumSize">
+           <size>
+            <width>140</width>
+            <height>16777215</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>Number of ISO lines per face edge</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignRight</set>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>IsoCount</cstring>
           </property>