diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui b/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
index 75d473827e..cc98895f63 100644
--- a/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui
@@ -22,7 +22,7 @@
         <x>0</x>
         <y>0</y>
         <width>368</width>
-        <height>441</height>
+        <height>445</height>
        </rect>
       </property>
       <attribute name="label">
@@ -75,15 +75,15 @@
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm/s</string>
+            </property>
             <property name="minimum">
              <double>0.000000000000000</double>
             </property>
             <property name="maximum">
              <double>9999999.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm/s</string>
-            </property>
            </widget>
           </item>
           <item row="1" column="0">
@@ -104,15 +104,15 @@
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm/s</string>
+            </property>
             <property name="minimum">
              <double>0.000000000000000</double>
             </property>
             <property name="maximum">
              <double>9999999.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm/s</string>
-            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -133,15 +133,15 @@
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm/s</string>
+            </property>
             <property name="minimum">
              <double>0.000000000000000</double>
             </property>
             <property name="maximum">
              <double>9999999.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm/s</string>
-            </property>
            </widget>
           </item>
           <item row="3" column="0">
@@ -162,15 +162,15 @@
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm/s</string>
+            </property>
             <property name="minimum">
              <double>0.000000000000000</double>
             </property>
             <property name="maximum">
              <double>9999999.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm/s</string>
-            </property>
            </widget>
           </item>
          </layout>
@@ -233,7 +233,7 @@
         <x>0</x>
         <y>0</y>
         <width>368</width>
-        <height>441</height>
+        <height>445</height>
        </rect>
       </property>
       <attribute name="label">
@@ -446,7 +446,10 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="text" stdset="0">
-             <string>0.00</string>
+             <string>0 mm</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
@@ -457,9 +460,6 @@
             <property name="singleStep">
              <double>0.125000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm</string>
-            </property>
            </widget>
           </item>
           <item row="8" column="1">
@@ -474,7 +474,10 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="text" stdset="0">
-             <string>0.00</string>
+             <string>0 mm</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
@@ -482,9 +485,6 @@
             <property name="maximum">
              <double>100.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm</string>
-            </property>
            </widget>
           </item>
           <item row="12" column="1">
@@ -499,7 +499,10 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="text" stdset="0">
-             <string>0.00</string>
+             <string>0 mm</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
@@ -507,9 +510,6 @@
             <property name="maximum">
              <double>100.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm</string>
-            </property>
            </widget>
           </item>
           <item row="14" column="1">
@@ -524,7 +524,10 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="text" stdset="0">
-             <string>0.00</string>
+             <string>0 mm</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
@@ -532,9 +535,6 @@
             <property name="maximum">
              <double>100.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm</string>
-            </property>
            </widget>
           </item>
           <item row="18" column="1">
@@ -549,7 +549,10 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="text" stdset="0">
-             <string>0.00</string>
+             <string>0 mm</string>
+            </property>
+            <property name="unit" stdset="0">
+             <string notr="true">mm</string>
             </property>
             <property name="minimum">
              <double>0.000000000000000</double>
@@ -557,9 +560,6 @@
             <property name="maximum">
              <double>100.000000000000000</double>
             </property>
-            <property name="unit" stdset="0">
-             <string notr="true">mm</string>
-            </property>
            </widget>
           </item>
           <item row="16" column="1">
@@ -576,6 +576,12 @@
             <property name="unit" stdset="0">
              <string notr="true">°</string>
             </property>
+            <property name="minimum">
+             <double>0.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>90.000000000000000</double>
+            </property>
            </widget>
           </item>
          </layout>
@@ -616,7 +622,7 @@
  <customwidgets>
   <customwidget>
    <class>Gui::QuantitySpinBox</class>
-   <extends>QDoubleSpinBox</extends>
+   <extends>QWidget</extends>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
diff --git a/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
index ea59dcf748..eabcce43d9 100644
--- a/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/ToolEdit.ui
@@ -212,13 +212,13 @@
         <property name="text">
          <string>0 mm</string>
         </property>
-        <property name="singleStep" stdset="0">
+        <property name="singleStep">
          <double>0.125000000000000</double>
         </property>
-        <property name="maximum" stdset="0">
+        <property name="maximum">
          <double>100.000000000000000</double>
         </property>
-        <property name="minimum" stdset="0">
+        <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="unit" stdset="0">
@@ -231,10 +231,10 @@
         <property name="text">
          <string>0 mm</string>
         </property>
-        <property name="maximum" stdset="0">
+        <property name="maximum">
          <double>100.000000000000000</double>
         </property>
-        <property name="minimum" stdset="0">
+        <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="unit" stdset="0">
@@ -247,10 +247,10 @@
         <property name="text">
          <string>0 mm</string>
         </property>
-        <property name="maximum" stdset="0">
+        <property name="maximum">
          <double>100.000000000000000</double>
         </property>
-        <property name="minimum" stdset="0">
+        <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="unit" stdset="0">
@@ -263,10 +263,10 @@
         <property name="text">
          <string>0 mm</string>
         </property>
-        <property name="maximum" stdset="0">
+        <property name="maximum">
          <double>100.000000000000000</double>
         </property>
-        <property name="minimum" stdset="0">
+        <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="unit" stdset="0">
@@ -279,10 +279,10 @@
         <property name="text">
          <string>0 mm</string>
         </property>
-        <property name="maximum" stdset="0">
+        <property name="maximum">
          <double>100.000000000000000</double>
         </property>
-        <property name="minimum" stdset="0">
+        <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="unit" stdset="0">
@@ -292,6 +292,12 @@
       </item>
       <item row="16" column="1">
        <widget class="Gui::InputField" name="CuttingEdgeAngleField">
+        <property name="maximum">
+         <double>90.000000000000000</double>
+        </property>
+        <property name="minimum">
+         <double>0.000000000000000</double>
+        </property>
         <property name="unit" stdset="0">
          <string notr="true">°</string>
         </property>