diff --git a/src/Mod/Fem/Gui/Resources/ui/ConstraintTie.ui b/src/Mod/Fem/Gui/Resources/ui/ConstraintTie.ui
index 6f8a27596e..b12ac6e795 100644
--- a/src/Mod/Fem/Gui/Resources/ui/ConstraintTie.ui
+++ b/src/Mod/Fem/Gui/Resources/ui/ConstraintTie.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
-    <height>500</height>
+    <width>300</width>
+    <height>79</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -83,19 +83,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.ui b/src/Mod/Fem/Gui/TaskFemConstraint.ui
index 2ca053720b..6092402fe2 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraint.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraint.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>461</height>
+    <width>300</width>
+    <height>377</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.ui b/src/Mod/Fem/Gui/TaskFemConstraintBearing.ui
index 41bd159907..188f184be2 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>534</height>
+    <width>300</width>
+    <height>447</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -250,19 +250,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>17</width>
-       <height>56</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.ui b/src/Mod/Fem/Gui/TaskFemConstraintContact.ui
index cfc6b4d8d7..558e7a88a1 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintContact.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.ui
@@ -6,40 +6,42 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
-    <height>251</height>
+    <width>300</width>
+    <height>234</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <widget class="QLabel" name="lbl_info_2">
+     <property name="text">
+      <string>Select master face, click Add or Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="hLayout1_2">
      <item>
-      <widget class="QLabel" name="lbl_info_2">
+      <widget class="QToolButton" name="btnAddMaster">
        <property name="text">
-        <string>Select master face, click Add or Remove</string>
+        <string>Add</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="QPushButton" name="btnAddMaster">
-         <property name="text">
-          <string>Add</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnRemoveMaster">
-         <property name="text">
-          <string>Remove</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QToolButton" name="btnRemoveMaster">
+       <property name="text">
+        <string>Remove</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -60,31 +62,33 @@
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <widget class="QLabel" name="lbl_info">
+     <property name="text">
+      <string>Select slave face, click Add or Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="hLayout1_3">
      <item>
-      <widget class="QLabel" name="lbl_info">
+      <widget class="QToolButton" name="btnAddSlave">
        <property name="text">
-        <string>Select slave face, click Add or Remove</string>
+        <string>Add</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QPushButton" name="btnAddSlave">
-         <property name="text">
-          <string>Add</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnRemoveSlave">
-         <property name="text">
-          <string>Remove</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QToolButton" name="btnRemoveSlave">
+       <property name="text">
+        <string>Remove</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -118,13 +122,13 @@
      </item>
      <item>
       <widget class="Gui::InputField" name="spSlope">
-       <property name="maximum">
+       <property name="maximum" stdset="0">
         <double>1000000000.000000000000000</double>
        </property>
-       <property name="singleStep">
+       <property name="singleStep" stdset="0">
         <double>1.000000000000000</double>
        </property>
-       <property name="value">
+       <property name="value" stdset="0">
         <double>1000000.000000000000000</double>
        </property>
        <property name="unit" stdset="0">
@@ -146,7 +150,7 @@
      <item>
       <widget class="QDoubleSpinBox" name="spFriction">
        <property name="decimals">
-        <number>1</number>
+        <number>2</number>
        </property>
        <property name="maximum">
         <double>1.000000000000000</double>
@@ -159,10 +163,8 @@
     </layout>
    </item>
   </layout>
-  <zorder>lbl_info</zorder>
   <zorder>lw_referencesSlave</zorder>
   <zorder>lw_referencesMaster</zorder>
-  <zorder>lbl_info_2</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.ui b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.ui
index d70fc48f40..ddf14926b3 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>330</width>
-    <height>717</height>
+    <width>300</width>
+    <height>641</height>
    </rect>
   </property>
   <property name="sizePolicy">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.ui b/src/Mod/Fem/Gui/TaskFemConstraintFixed.ui
index 2ded773f6f..a2243f1ba1 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>309</width>
-    <height>207</height>
+    <width>300</width>
+    <height>137</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui
index ab044095d2..c90570687f 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.ui
@@ -6,22 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>330</width>
-    <height>430</height>
+    <width>300</width>
+    <height>391</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>330</width>
-    <height>430</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -93,7 +81,7 @@
           <string>Add</string>
          </property>
          <property name="checkable">
-           <bool>true</bool>
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -103,7 +91,7 @@
           <string>Remove</string>
          </property>
          <property name="checkable">
-           <bool>true</bool>
+          <bool>true</bool>
          </property>
         </widget>
        </item>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.ui b/src/Mod/Fem/Gui/TaskFemConstraintForce.ui
index 7ae0e5fbd0..b693537b2a 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.ui
@@ -6,22 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>330</width>
-    <height>320</height>
+    <width>300</width>
+    <height>236</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-    <horstretch>3</horstretch>
-    <verstretch>35</verstretch>
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>330</width>
-    <height>300</height>
-   </size>
-  </property>
   <property name="baseSize">
    <size>
     <width>400</width>
@@ -89,7 +83,7 @@
       </widget>
      </item>
      <item>
-      <widget class="Gui::QuantitySpinBox" name="spinForce">
+      <widget class="Gui::QuantitySpinBox" name="spinForce" native="true">
        <property name="value" stdset="0">
         <double>500.000000000000000</double>
        </property>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui
index 0fa4fdeeb2..7652e16339 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>379</width>
-    <height>531</height>
+    <width>300</width>
+    <height>238</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.ui b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.ui
index 9f06e133d1..7a5f7eaa57 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>307</width>
-    <height>118</height>
+    <width>300</width>
+    <height>57</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.ui b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.ui
index 4b9da04766..b849909468 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>309</width>
-    <height>207</height>
+    <width>300</width>
+    <height>137</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,17 +24,23 @@
    <item>
     <layout class="QHBoxLayout" name="hLayout1">
      <item>
-      <widget class="QPushButton" name="btnAdd">
+      <widget class="QToolButton" name="btnAdd">
        <property name="text">
         <string>Add</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="btnRemove">
+      <widget class="QToolButton" name="btnRemove">
        <property name="text">
         <string>Remove</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.ui b/src/Mod/Fem/Gui/TaskFemConstraintPressure.ui
index ceb96b4737..a1ebe2b9ca 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>226</width>
+    <width>300</width>
     <height>253</height>
    </rect>
   </property>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui b/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui
index cc4b2ea63e..a1e829cdd5 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>313</width>
-    <height>321</height>
+    <width>300</width>
+    <height>191</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.ui b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.ui
index d36271a5d4..6509d8e6b3 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>503</width>
-    <height>340</height>
+    <width>300</width>
+    <height>190</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.ui b/src/Mod/Fem/Gui/TaskFemConstraintTransform.ui
index 8c0583abff..26a6cbe451 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.ui
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>382</width>
-    <height>491</height>
+    <width>350</width>
+    <height>334</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,19 +46,25 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="hLayout1_3">
+    <layout class="QHBoxLayout" name="hLayout1">
      <item>
-      <widget class="QPushButton" name="btnAdd">
+      <widget class="QToolButton" name="btnAdd">
        <property name="text">
         <string>Add</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="btnRemove">
+      <widget class="QToolButton" name="btnRemove">
        <property name="text">
         <string>Remove</string>
        </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>