diff --git a/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui
index 09df3c50d..79e1071ee 100644
--- a/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui
@@ -34,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>304</width>
-        <height>367</height>
+        <height>375</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -111,8 +111,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>304</width>
-        <height>367</height>
+        <width>109</width>
+        <height>82</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -172,8 +172,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>304</width>
-        <height>367</height>
+        <width>144</width>
+        <height>82</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -233,8 +233,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>304</width>
-        <height>367</height>
+        <width>223</width>
+        <height>31</height>
        </rect>
       </property>
       <attribute name="icon">
diff --git a/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui b/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui
index 024577e34..e9874ee82 100644
--- a/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui
@@ -34,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>303</width>
-        <height>366</height>
+        <height>374</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -111,8 +111,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>303</width>
-        <height>366</height>
+        <width>109</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -158,8 +158,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>303</width>
-        <height>366</height>
+        <width>144</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -205,8 +205,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>303</width>
-        <height>366</height>
+        <width>223</width>
+        <height>31</height>
        </rect>
       </property>
       <attribute name="icon">
diff --git a/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui
index 76aff59f5..917164e99 100644
--- a/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -192,8 +192,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>322</width>
-        <height>99</height>
+        <width>144</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -242,7 +242,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>305</width>
+        <width>261</width>
         <height>191</height>
        </rect>
       </property>
diff --git a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
index 208ac7735..ab2988426 100644
--- a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui
@@ -29,7 +29,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>5</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -117,8 +117,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>343</height>
+        <width>114</width>
+        <height>108</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -195,8 +195,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>343</height>
+        <width>144</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -245,8 +245,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>343</height>
+        <width>94</width>
+        <height>24</height>
        </rect>
       </property>
       <attribute name="label">
@@ -259,8 +259,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>343</height>
+        <width>178</width>
+        <height>120</height>
        </rect>
       </property>
       <attribute name="label">
diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui
index b3744ee7c..18f1ac7b6 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>4</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -33,8 +33,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>212</width>
-        <height>273</height>
+        <width>334</width>
+        <height>330</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -289,8 +289,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>330</height>
+        <width>278</width>
+        <height>214</height>
        </rect>
       </property>
       <attribute name="icon">
diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui
index 587bcee8d..7c1cf3971 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>4</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -111,8 +111,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>381</width>
-        <height>363</height>
+        <width>109</width>
+        <height>82</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -178,8 +178,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>381</width>
-        <height>363</height>
+        <width>144</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -228,8 +228,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>381</width>
-        <height>363</height>
+        <width>160</width>
+        <height>111</height>
        </rect>
       </property>
       <attribute name="label">
@@ -286,8 +286,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>381</width>
-        <height>363</height>
+        <width>274</width>
+        <height>251</height>
        </rect>
       </property>
       <attribute name="icon">
diff --git a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui
index d78ed18e0..97e3b1ad7 100644
--- a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Geometry">
       <property name="enabled">
@@ -186,8 +186,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>395</height>
+        <width>144</width>
+        <height>56</height>
        </rect>
       </property>
       <attribute name="icon">
@@ -236,8 +236,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>334</width>
-        <height>195</height>
+        <width>203</width>
+        <height>31</height>
        </rect>
       </property>
       <attribute name="icon">