diff --git a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui
index f80fdf98c6..d5f3c8c822 100644
--- a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="Depths">
       <property name="geometry">
@@ -31,7 +31,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>318</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -66,19 +66,6 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QDoubleSpinBox" name="stepDown">
-         <property name="decimals">
-          <number>3</number>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
@@ -93,6 +80,16 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0">
+        <widget class="Gui::InputField" name="stepDown">
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="unit" stdset="0">
+          <string notr="true">mm</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Heights">
@@ -101,7 +98,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>318</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -151,7 +148,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>318</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="label">
@@ -209,7 +206,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>318</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -280,35 +277,8 @@
        <item row="3" column="1">
         <widget class="QWidget" name="widget_4" native="true">
          <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>Extra Offset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="extraOffset"/>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_10">
-            <property name="text">
-             <string>Segment Length</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="segLen"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_11">
-            <property name="text">
-             <string>Roll Radius</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="rollRadius"/>
+          <item row="3" column="2">
+           <widget class="QDoubleSpinBox" name="plungeAngle"/>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_13">
@@ -317,8 +287,49 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="plungeAngle"/>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Roll Radius</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Segment Length</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Extra Offset</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QDoubleSpinBox" name="segLen"/>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::InputField" name="extraOffset">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="Gui::InputField" name="rollRadius">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
diff --git a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
index edb60bf132..c4ebd835a0 100644
--- a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
@@ -10,6 +10,12 @@
     <height>525</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
@@ -23,7 +29,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>0</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -34,7 +40,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -112,7 +118,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -165,19 +171,6 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QDoubleSpinBox" name="stepDown">
-         <property name="decimals">
-          <number>3</number>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
        <item row="3" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
@@ -185,6 +178,16 @@
          </property>
         </widget>
        </item>
+       <item row="3" column="0">
+        <widget class="Gui::InputField" name="stepDown">
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="unit" stdset="0">
+          <string notr="true">mm</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Heights">
@@ -193,7 +196,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -243,7 +246,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="label">
@@ -257,7 +260,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="label">
@@ -331,7 +334,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>329</height>
+        <height>321</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -406,20 +409,35 @@
          </layout>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="8" column="0" colspan="2">
         <widget class="QWidget" name="widget_4" native="true">
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>Material Allowance</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="extraOffset"/>
-          </item>
-         </layout>
+         <layout class="QGridLayout" name="gridLayout_6"/>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Material Allowance</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="Gui::InputField" name="extraOffset">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="unit" stdset="0">
+          <string notr="true">mm</string>
+         </property>
         </widget>
        </item>
       </layout>
diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui
index 80ad39a545..200acefd70 100644
--- a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -34,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>319</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -111,8 +111,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>168</width>
-        <height>99</height>
+        <width>334</width>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -151,19 +151,6 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QDoubleSpinBox" name="stepDown">
-         <property name="decimals">
-          <number>3</number>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
@@ -171,6 +158,22 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0">
+        <widget class="Gui::InputField" name="stepDown">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="historySize">
+          <number>8</number>
+         </property>
+         <property name="unit" stdset="0">
+          <string notr="true">mm</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Heights">
@@ -178,8 +181,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>165</width>
-        <height>70</height>
+        <width>334</width>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -229,7 +232,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>319</height>
+        <height>313</height>
        </rect>
       </property>
       <attribute name="label">
@@ -285,9 +288,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>322</width>
-        <height>306</height>
+        <y>-15</y>
+        <width>320</width>
+        <height>338</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -331,8 +334,18 @@
        <item row="3" column="1">
         <widget class="QWidget" name="widget_4" native="true">
          <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="extraOffset"/>
+          <item row="1" column="2">
+           <widget class="QDoubleSpinBox" name="segLen"/>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::InputField" name="extraOffset">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
+            </property>
+           </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_10">
@@ -341,9 +354,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="segLen"/>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
@@ -351,9 +361,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="rollRadius"/>
-          </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
@@ -361,7 +368,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="3" column="2">
            <widget class="QDoubleSpinBox" name="plungeAngle"/>
           </item>
           <item row="0" column="0">
@@ -371,6 +378,16 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="2">
+           <widget class="Gui::InputField" name="rollRadius">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui
index 8238fc6856..74293db727 100644
--- a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -34,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>381</width>
-        <height>353</height>
+        <height>346</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -112,7 +112,7 @@
         <x>0</x>
         <y>0</y>
         <width>381</width>
-        <height>353</height>
+        <height>346</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -151,19 +151,6 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QDoubleSpinBox" name="stepDown">
-         <property name="decimals">
-          <number>3</number>
-         </property>
-         <property name="minimum">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
@@ -171,6 +158,19 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0">
+        <widget class="Gui::InputField" name="stepDown">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+         <property name="minimum">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="unit" stdset="0">
+          <string notr="true">mm</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Heights">
@@ -179,7 +179,7 @@
         <x>0</x>
         <y>0</y>
         <width>381</width>
-        <height>353</height>
+        <height>346</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -229,7 +229,7 @@
         <x>0</x>
         <y>0</y>
         <width>381</width>
-        <height>353</height>
+        <height>346</height>
        </rect>
       </property>
       <attribute name="label">
@@ -285,9 +285,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>381</width>
-        <height>353</height>
+        <y>-28</y>
+        <width>367</width>
+        <height>384</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -345,6 +345,13 @@
        <item row="5" column="0" colspan="2">
         <widget class="QWidget" name="widget_4" native="true">
          <layout class="QGridLayout" name="gridLayout_6">
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>Plunge Angle</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
@@ -352,9 +359,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QDoubleSpinBox" name="extraOffset"/>
-          </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
@@ -362,12 +366,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QDoubleSpinBox" name="segLen"/>
-          </item>
-          <item row="2" column="1">
-           <widget class="QDoubleSpinBox" name="rollRadius"/>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
@@ -375,15 +373,31 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_13">
-            <property name="text">
-             <string>Plunge Angle</string>
+          <item row="3" column="2">
+           <widget class="QDoubleSpinBox" name="plungeAngle"/>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::InputField" name="extraOffset">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="plungeAngle"/>
+          <item row="1" column="2">
+           <widget class="QDoubleSpinBox" name="segLen"/>
+          </item>
+          <item row="2" column="2">
+           <widget class="Gui::InputField" name="rollRadius">
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
diff --git a/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
index 45a60cb1b8..0d18a258f4 100644
--- a/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>361</width>
-    <height>418</height>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -167,19 +167,6 @@
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QDoubleSpinBox" name="DiameterField">
-        <property name="suffix">
-         <string>mm</string>
-        </property>
-        <property name="minimum">
-         <double>0.010000000000000</double>
-        </property>
-        <property name="value">
-         <double>5.000000000000000</double>
-        </property>
-       </widget>
-      </item>
       <item row="8" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
@@ -187,13 +174,6 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="1">
-       <widget class="QDoubleSpinBox" name="LengthOffsetField">
-        <property name="suffix">
-         <string>mm</string>
-        </property>
-       </widget>
-      </item>
       <item row="12" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
@@ -201,13 +181,6 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="1">
-       <widget class="QDoubleSpinBox" name="FlatRadiusField">
-        <property name="suffix">
-         <string>mm</string>
-        </property>
-       </widget>
-      </item>
       <item row="14" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
@@ -215,13 +188,6 @@
         </property>
        </widget>
       </item>
-      <item row="14" column="1">
-       <widget class="QDoubleSpinBox" name="CornerRadiusField">
-        <property name="suffix">
-         <string>mm</string>
-        </property>
-       </widget>
-      </item>
       <item row="16" column="0">
        <widget class="QLabel" name="label_9">
         <property name="text">
@@ -243,16 +209,86 @@
         </property>
        </widget>
       </item>
-      <item row="18" column="1">
-       <widget class="QDoubleSpinBox" name="CuttingEdgeHeightField">
-        <property name="suffix">
-         <string>mm</string>
+      <item row="6" column="1">
+       <widget class="Gui::InputField" name="DiameterField">
+        <property name="text">
+         <string>0 mm</string>
+        </property>
+        <property name="singleStep">
+         <double>0.125000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
         </property>
         <property name="minimum">
-         <double>0.100000000000000</double>
+         <double>0.000000000000000</double>
         </property>
-        <property name="value">
-         <double>10.000000000000000</double>
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1">
+       <widget class="Gui::InputField" name="LengthOffsetField">
+        <property name="text">
+         <string>0 mm</string>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
+        </property>
+        <property name="minimum">
+         <double>0.000000000000000</double>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="1">
+       <widget class="Gui::InputField" name="FlatRadiusField">
+        <property name="text">
+         <string>0 mm</string>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
+        </property>
+        <property name="minimum">
+         <double>0.000000000000000</double>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="14" column="1">
+       <widget class="Gui::InputField" name="CornerRadiusField">
+        <property name="text">
+         <string>0 mm</string>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
+        </property>
+        <property name="minimum">
+         <double>0.000000000000000</double>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="18" column="1">
+       <widget class="Gui::InputField" name="CuttingEdgeHeightField">
+        <property name="text">
+         <string>0 mm</string>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
+        </property>
+        <property name="minimum">
+         <double>0.000000000000000</double>
+        </property>
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
         </property>
        </widget>
       </item>
@@ -271,6 +307,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::InputField</class>
+   <extends>QLineEdit</extends>
+   <header>Gui/InputField.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/Path/PathScripts/PathContour.py b/src/Mod/Path/PathScripts/PathContour.py
index 3e33b6a5e1..f113e720f4 100644
--- a/src/Mod/Path/PathScripts/PathContour.py
+++ b/src/Mod/Path/PathScripts/PathContour.py
@@ -67,8 +67,8 @@ class ObjectContour:
         # Depth Properties
         obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions"))
         obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations."))
-        obj.addProperty("App::PropertyFloatConstraint", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
-        obj.StepDown = (1, 0.01, 1000, 0.5)
+        obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
+        #obj.StepDown = (1, 0.01, 1000, 0.5)
         obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z"))
         obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z"))
 
@@ -198,7 +198,7 @@ class ObjectContour:
 
         depthparams = depth_params(
             obj.ClearanceHeight.Value,
-            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown, 0.0,
+            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0,
             obj.FinalDepth.Value, None)
 
         PathKurveUtils.profile2(
@@ -447,13 +447,13 @@ class TaskPanel:
             if hasattr(self.obj, "ClearanceHeight"):
                 self.obj.ClearanceHeight = self.form.clearanceHeight.text()
             if hasattr(self.obj, "StepDown"):
-                self.obj.StepDown = self.form.stepDown.value()
+                self.obj.StepDown = self.form.stepDown.text()
             if hasattr(self.obj, "OffsetExtra"):
-                self.obj.OffsetExtra = self.form.extraOffset.value()
+                self.obj.OffsetExtra = self.form.extraOffset.text()
             if hasattr(self.obj, "SegLen"):
                 self.obj.SegLen = self.form.segLen.value()
             if hasattr(self.obj, "RollRadius"):
-                self.obj.RollRadius = self.form.rollRadius.value()
+                self.obj.RollRadius = self.form.rollRadius.text()
             if hasattr(self.obj, "PlungeAngle"):
                 self.obj.PlungeAngle = str(self.form.plungeAngle.value())
             if hasattr(self.obj, "UseComp"):
@@ -471,10 +471,10 @@ class TaskPanel:
         self.form.finalDepth.setText(str(self.obj.FinalDepth.Value))
         self.form.safeHeight.setText(str(self.obj.SafeHeight.Value))
         self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value))
-        self.form.stepDown.setValue(self.obj.StepDown)
-        self.form.extraOffset.setValue(self.obj.OffsetExtra.Value)
+        self.form.stepDown.setText(str(self.obj.StepDown.Value))
+        self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value))
         self.form.segLen.setValue(self.obj.SegLen.Value)
-        self.form.rollRadius.setValue(self.obj.RollRadius.Value)
+        self.form.rollRadius.setText(str(self.obj.RollRadius.Value))
         self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value)
         self.form.useCompensation.setChecked(self.obj.UseComp)
         self.form.useStartPoint.setChecked(self.obj.UseStartPoint)
diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py
index fdffa28599..6689e178ed 100644
--- a/src/Mod/Path/PathScripts/PathPocket.py
+++ b/src/Mod/Path/PathScripts/PathPocket.py
@@ -65,8 +65,8 @@ class ObjectPocket:
         # Depth Properties
         obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions"))
         obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations."))
-        obj.addProperty("App::PropertyFloatConstraint", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
-        obj.StepDown = (0.0, 0.01, 100.0, 0.5)
+        obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
+        #obj.StepDown = (0.0, 0.01, 100.0, 0.5)
         obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z"))
         obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z"))
         obj.addProperty("App::PropertyDistance", "FinishDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Maximum material removed on final pass."))
@@ -553,9 +553,9 @@ class TaskPanel:
             if hasattr(self.obj, "ClearanceHeight"):
                 self.obj.ClearanceHeight = self.form.clearanceHeight.text()
             if hasattr(self.obj, "StepDown"):
-                self.obj.StepDown = self.form.stepDown.value()
+                self.obj.StepDown = self.form.stepDown.text()
             if hasattr(self.obj, "MaterialAllowance"):
-                self.obj.MaterialAllowance = self.form.extraOffset.value()
+                self.obj.MaterialAllowance = self.form.extraOffset.text()
             if hasattr(self.obj, "UseStartPoint"):
                 self.obj.UseStartPoint = self.form.useStartPoint.isChecked()
             if hasattr(self.obj, "Algorithm"):
@@ -578,8 +578,8 @@ class TaskPanel:
         self.form.finalDepth.setText(str(self.obj.FinalDepth.Value))
         self.form.safeHeight.setText(str(self.obj.SafeHeight.Value))
         self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value))
-        self.form.stepDown.setValue(self.obj.StepDown)
-        self.form.extraOffset.setValue(self.obj.MaterialAllowance.Value)
+        self.form.stepDown.setText(str(self.obj.StepDown))
+        self.form.extraOffset.setText(str(self.obj.MaterialAllowance.Value))
         self.form.useStartPoint.setChecked(self.obj.UseStartPoint)
         self.form.useZigZag.setChecked(self.obj.UseZigZag)
         self.form.zigZagUnidirectional.setChecked(self.obj.ZigUnidirectional)
diff --git a/src/Mod/Path/PathScripts/PathProfile.py b/src/Mod/Path/PathScripts/PathProfile.py
index 72e04326e2..2ac149e8b9 100644
--- a/src/Mod/Path/PathScripts/PathProfile.py
+++ b/src/Mod/Path/PathScripts/PathProfile.py
@@ -68,8 +68,8 @@ class ObjectProfile:
         # Depth Properties
         obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions"))
         obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations."))
-        obj.addProperty("App::PropertyFloatConstraint", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
-        obj.StepDown = (1, 0.01, 1000, 0.5)
+        obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
+        #obj.StepDown = (1, 0.01, 1000, 0.5)
         obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z"))
         obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z"))
 
@@ -96,8 +96,8 @@ class ObjectProfile:
         obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final profile- good for roughing toolpath"))
         obj.addProperty("App::PropertyLength", "SegLen", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation  value for tool paths made from beziers, bsplines, and ellipses"))
         obj.addProperty("App::PropertyAngle", "PlungeAngle", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn"))
-        obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile holes as well as the outline"))
-        obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile the outline"))
+        obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile holes as well as the outline"))
+        obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile the outline"))
 
         obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations"))
 
@@ -165,7 +165,7 @@ class ObjectProfile:
         obj.Base = baselist
         self.execute(obj)
 
-    def _buildPathLibarea(self, obj, edgelist, isHole):
+    def _buildPathLibarea(self, obj, edgelist, isHole):
         import PathScripts.PathKurveUtils as PathKurveUtils
         import math
         import area
@@ -194,7 +194,7 @@ class ObjectProfile:
 
         output = ""
         output += "G0 Z" + str(obj.ClearanceHeight.Value) + "F " + PathUtils.fmt(self.vertRapid) + "\n"
-        curve = PathKurveUtils.makeAreaCurve(edgelist, direction, startpoint, endpoint)
+        curve = PathKurveUtils.makeAreaCurve(edgelist, direction, startpoint, endpoint)
 
         '''The following line uses a profile function written for use with FreeCAD.  It's clean but incomplete.  It doesn't handle
 print "x = " + str(point.x)
@@ -230,7 +230,7 @@ print "y - " + str(point.y)
 
         depthparams = depth_params(
             obj.ClearanceHeight.Value,
-            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown, 0.0,
+            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0,
             obj.FinalDepth.Value, None)
 
         PathKurveUtils.profile2(
@@ -495,13 +495,13 @@ class TaskPanel:
             if hasattr(self.obj, "ClearanceHeight"):
                 self.obj.ClearanceHeight = self.form.clearanceHeight.text()
             if hasattr(self.obj, "StepDown"):
-                self.obj.StepDown = self.form.stepDown.value()
+                self.obj.StepDown = self.form.stepDown.text()
             if hasattr(self.obj, "OffsetExtra"):
-                self.obj.OffsetExtra = self.form.extraOffset.value()
+                self.obj.OffsetExtra = self.form.extraOffset.text()
             if hasattr(self.obj, "SegLen"):
                 self.obj.SegLen = self.form.segLen.value()
             if hasattr(self.obj, "RollRadius"):
-                self.obj.RollRadius = self.form.rollRadius.value()
+                self.obj.RollRadius = self.form.rollRadius.text()
             if hasattr(self.obj, "PlungeAngle"):
                 self.obj.PlungeAngle = str(self.form.plungeAngle.value())
             if hasattr(self.obj, "UseComp"):
@@ -525,10 +525,10 @@ class TaskPanel:
         self.form.finalDepth.setText(str(self.obj.FinalDepth.Value))
         self.form.safeHeight.setText(str(self.obj.SafeHeight.Value))
         self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value))
-        self.form.stepDown.setValue(self.obj.StepDown)
-        self.form.extraOffset.setValue(self.obj.OffsetExtra.Value)
+        self.form.stepDown.setText(str(self.obj.StepDown))
+        self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value))
         self.form.segLen.setValue(self.obj.SegLen.Value)
-        self.form.rollRadius.setValue(self.obj.RollRadius.Value)
+        self.form.rollRadius.setText(str(self.obj.RollRadius.Value))
         self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value)
         self.form.useCompensation.setChecked(self.obj.UseComp)
         self.form.useStartPoint.setChecked(self.obj.UseStartPoint)
diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py
index a56a21440e..2c71d6adfc 100644
--- a/src/Mod/Path/PathScripts/PathProfileEdges.py
+++ b/src/Mod/Path/PathScripts/PathProfileEdges.py
@@ -70,8 +70,8 @@ class ObjectProfile:
         # Depth Properties
         obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions"))
         obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations"))
-        obj.addProperty("App::PropertyFloatConstraint", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
-        obj.StepDown = (1, 0.01, 1000, 0.5)
+        obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool"))
+        #obj.StepDown = (1, 0.01, 1000, 0.5)
         obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z"))
         obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z"))
 
@@ -226,7 +226,7 @@ print "y - " + str(point.y)
 
         depthparams = depth_params(
             obj.ClearanceHeight.Value,
-            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown, 0.0,
+            obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0,
             obj.FinalDepth.Value, None)
 
         PathKurveUtils.profile2(
@@ -482,13 +482,13 @@ class TaskPanel:
             if hasattr(self.obj, "ClearanceHeight"):
                 self.obj.ClearanceHeight = self.form.clearanceHeight.text()
             if hasattr(self.obj, "StepDown"):
-                self.obj.StepDown = self.form.stepDown.value()
+                self.obj.StepDown = self.form.stepDown.text()
             if hasattr(self.obj, "OffsetExtra"):
-                self.obj.OffsetExtra = self.form.extraOffset.value()
+                self.obj.OffsetExtra = self.form.extraOffset.text()
             if hasattr(self.obj, "SegLen"):
                 self.obj.SegLen = self.form.segLen.value()
             if hasattr(self.obj, "RollRadius"):
-                self.obj.RollRadius = self.form.rollRadius.value()
+                self.obj.RollRadius = self.form.rollRadius.text()
             if hasattr(self.obj, "PlungeAngle"):
                 self.obj.PlungeAngle = str(self.form.plungeAngle.value())
             if hasattr(self.obj, "UseComp"):
@@ -510,10 +510,10 @@ class TaskPanel:
         self.form.finalDepth.setText(str(self.obj.FinalDepth.Value))
         self.form.safeHeight.setText(str(self.obj.SafeHeight.Value))
         self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value))
-        self.form.stepDown.setValue(self.obj.StepDown)
-        self.form.extraOffset.setValue(self.obj.OffsetExtra.Value)
+        self.form.stepDown.setText(str(self.obj.StepDown.Value))
+        self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value))
         self.form.segLen.setValue(self.obj.SegLen.Value)
-        self.form.rollRadius.setValue(self.obj.RollRadius.Value)
+        self.form.rollRadius.setText(str(self.obj.RollRadius.Value))
         self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value)
         self.form.useCompensation.setChecked(self.obj.UseComp)
         self.form.useStartPoint.setChecked(self.obj.UseStartPoint)
diff --git a/src/Mod/Path/PathScripts/PathToolLibraryManager.py b/src/Mod/Path/PathScripts/PathToolLibraryManager.py
index f252b06fcd..67103a5130 100644
--- a/src/Mod/Path/PathScripts/PathToolLibraryManager.py
+++ b/src/Mod/Path/PathScripts/PathToolLibraryManager.py
@@ -190,6 +190,23 @@ class ToolLibraryManager():
         headers = ["","Tool Num.","Name","Tool Type","Material","Diameter","Length Offset","Flat Radius","Corner Radius","Cutting Edge Angle","Cutting Edge Height"]
         model = QtGui.QStandardItemModel()
         model.setHorizontalHeaderLabels(headers)
+
+        def unitconv(ivalue):
+            parms = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Units")
+            digits = parms.GetContents()[1][2] #get user's number of digits of precision
+            if parms.GetContents()[0][2]==0:
+                suffix = 'mm'
+                conversion = 1.0
+            elif parms.GetContents()[0][2]==3:
+                suffix = 'in'
+                conversion = 25.4
+            else:
+                suffix = ''
+            val = FreeCAD.Units.parseQuantity(str(round(ivalue/conversion,digits))+suffix)
+            displayed_val = val.UserString #just the displayed value-not the internal one
+
+            return displayed_val
+
         if tt:
             if len(tt.Tools) == 0:
                 tooldata.append([])
@@ -201,12 +218,12 @@ class ToolLibraryManager():
                 itemName =  QtGui.QStandardItem(t.Name)
                 itemToolType =  QtGui.QStandardItem(t.ToolType)
                 itemMaterial =  QtGui.QStandardItem(t.Material)
-                itemDiameter =  QtGui.QStandardItem(str(t.Diameter))
-                itemLengthOffset =  QtGui.QStandardItem(str(t.LengthOffset))
-                itemFlatRadius =  QtGui.QStandardItem(str(t.FlatRadius))
-                itmCornerRadius =  QtGui.QStandardItem(str(t.CornerRadius))
+                itemDiameter =  QtGui.QStandardItem(unitconv(t.Diameter))   
+                itemLengthOffset =  QtGui.QStandardItem(unitconv(t.LengthOffset))
+                itemFlatRadius =  QtGui.QStandardItem(unitconv(t.FlatRadius))
+                itmCornerRadius =  QtGui.QStandardItem(unitconv(t.CornerRadius))
                 itemCuttingEdgeAngle =  QtGui.QStandardItem(str(t.CuttingEdgeAngle))
-                itemCuttingEdgeHeight =  QtGui.QStandardItem(str(t.CuttingEdgeHeight))
+                itemCuttingEdgeHeight =  QtGui.QStandardItem(unitconv(t.CuttingEdgeHeight))
 
                 row = [itemcheck, itemNumber, itemName, itemToolType, itemMaterial, itemDiameter, itemLengthOffset, itemFlatRadius, itmCornerRadius, itemCuttingEdgeAngle, itemCuttingEdgeHeight]
                 model.appendRow(row)
@@ -397,12 +414,12 @@ class EditorPanel():
                 t.Name = str(editform.NameField.text())
             t.ToolType = self.getType(editform.TypeField.currentIndex())
             t.Material = self.getMaterial(editform.MaterialField.currentIndex())
-            t.Diameter = editform.DiameterField.value()
-            t.LengthOffset = editform.LengthOffsetField.value()
-            t.FlatRadius = editform.FlatRadiusField.value()
-            t.CornerRadius = editform.CornerRadiusField.value()
+            t.Diameter = FreeCAD.Units.parseQuantity(editform.DiameterField.text())
+            t.LengthOffset = FreeCAD.Units.parseQuantity(editform.LengthOffsetField.text())
+            t.FlatRadius = FreeCAD.Units.parseQuantity(editform.FlatRadiusField.text())
+            t.CornerRadius = FreeCAD.Units.parseQuantity(editform.CornerRadiusField.text())
             t.CuttingEdgeAngle = editform.CuttingEdgeAngleField.value()
-            t.CuttingEdgeHeight = editform.CuttingEdgeHeightField.value()
+            t.CuttingEdgeHeight = FreeCAD.Units.parseQuantity(editform.CuttingEdgeHeightField.text())
 
             listname = self.form.listView.selectedIndexes()[0].data()
             if self.TLM.addnew(listname, t) is True:
@@ -463,12 +480,12 @@ class EditorPanel():
         editform.NameField.setText(tool.Name)
         editform.TypeField.setCurrentIndex(self.getType(tool.ToolType))
         editform.MaterialField.setCurrentIndex(self.getMaterial(tool.Material))
-        editform.DiameterField.setValue(tool.Diameter)
-        editform.LengthOffsetField.setValue(tool.LengthOffset)
-        editform.FlatRadiusField.setValue(tool.FlatRadius)
-        editform.CornerRadiusField.setValue(tool.CornerRadius)
+        editform.DiameterField.setText(str(tool.Diameter))
+        editform.LengthOffsetField.setText(str(tool.LengthOffset))
+        editform.FlatRadiusField.setText(str(tool.FlatRadius))
+        editform.CornerRadiusField.setText(str(tool.CornerRadius))
         editform.CuttingEdgeAngleField.setValue(tool.CuttingEdgeAngle)
-        editform.CuttingEdgeHeightField.setValue(tool.CuttingEdgeHeight)
+        editform.CuttingEdgeHeightField.setText(str(tool.CuttingEdgeHeight))
 
         r = editform.exec_()
         if r:
@@ -476,12 +493,12 @@ class EditorPanel():
                 tool.Name = str(editform.NameField.text())
             tool.ToolType = self.getType(editform.TypeField.currentIndex())
             tool.Material = self.getMaterial(editform.MaterialField.currentIndex())
-            tool.Diameter = editform.DiameterField.value()
-            tool.LengthOffset = editform.LengthOffsetField.value()
-            tool.FlatRadius = editform.FlatRadiusField.value()
-            tool.CornerRadius = editform.CornerRadiusField.value()
+            tool.Diameter = FreeCAD.Units.parseQuantity(editform.DiameterField.text())
+            tool.LengthOffset = FreeCAD.Units.parseQuantity(editform.LengthOffsetField.text())
+            tool.FlatRadius = FreeCAD.Units.parseQuantity(editform.FlatRadiusField.text())
+            tool.CornerRadius = FreeCAD.Units.parseQuantity(editform.CornerRadiusField.text())
             tool.CuttingEdgeAngle = editform.CuttingEdgeAngleField.value()
-            tool.CuttingEdgeHeight = editform.CuttingEdgeHeightField.value()
+            tool.CuttingEdgeHeight = FreeCAD.Units.parseQuantity(editform.CuttingEdgeHeightField.text())
 
             if self.TLM.updateTool(listname, toolnum, tool) is True:
                 self.loadTable(self.form.listView.selectedIndexes()[0])