diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui b/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui
index e5bcc4c039..6e914f3f68 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui
@@ -29,7 +29,10 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="2" rowspan="2">
+      <item row="0" column="0" colspan="2">
+       <widget class="QComboBox" name="meshNameButton"/>
+      </item>
+     <item row="0" column="2" rowspan="2">
        <layout class="QGridLayout">
         <property name="margin">
          <number>0</number>
@@ -37,23 +40,6 @@
         <property name="spacing">
          <number>6</number>
         </property>
-        <item row="2" column="0">
-         <widget class="QLabel" name="textLabel3">
-          <property name="text">
-           <string>Number of points:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="QLabel" name="textLabel4">
-          <property name="text">
-           <string>No information</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="textLabel1">
           <property name="text">
@@ -61,8 +47,24 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
-         <widget class="QLabel" name="textLabel6">
+        <item row="0" column="1">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>16</width>
+            <height>21</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       <item row="0" column="2">
+         <widget class="QLabel" name="textLabel4">
           <property name="text">
            <string>No information</string>
           </property>
@@ -78,22 +80,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>16</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="1" column="1">
          <spacer>
           <property name="orientation">
@@ -120,7 +106,14 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="2" column="0">
+         <widget class="QLabel" name="textLabel3">
+          <property name="text">
+           <string>Number of points:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
          <spacer>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -131,12 +124,29 @@
           <property name="sizeHint" stdset="0">
            <size>
             <width>16</width>
-            <height>21</height>
+            <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
-       </layout>
+        <item row="2" column="2">
+         <widget class="QLabel" name="textLabel6">
+          <property name="text">
+           <string>No information</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QPushButton" name="refreshButton">
+        <property name="text">
+         <string>Refresh</string>
+        </property>
+       </widget>
       </item>
       <item row="1" column="1">
        <spacer>
@@ -154,17 +164,7 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="refreshButton">
-        <property name="text">
-         <string>Refresh</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QComboBox" name="meshNameButton"/>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="1" column="0">
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolid.ui b/src/Mod/Mesh/Gui/DlgRegularSolid.ui
index 3f453ae9df..84e5322ab2 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolid.ui
+++ b/src/Mod/Mesh/Gui/DlgRegularSolid.ui
@@ -23,61 +23,6 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="createSolidButton">
-       <property name="text">
-        <string>&amp;Create</string>
-       </property>
-       <property name="shortcut">
-        <string>Alt+C</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonClose">
-       <property name="text">
-        <string>Cl&amp;ose</string>
-       </property>
-       <property name="shortcut">
-        <string>Alt+O</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox1">
      <property name="title">
@@ -169,6 +114,49 @@
             <property name="spacing">
              <number>6</number>
             </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="textLabel2">
+              <property name="text">
+               <string>Length:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="Gui::QuantitySpinBox" name="boxLength">
+              <property name="unit" stdset="0">
+               <string notr="true">mm</string>
+              </property>
+              <property name="minimum">
+               <double>0.000000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>1000.000000000000000</double>
+              </property>
+              <property name="value">
+               <double>10.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="textLabel3">
+              <property name="text">
+               <string>Width:</string>
+              </property>
+             </widget>
+            </item>
+           <item row="1" column="1">
+             <widget class="Gui::QuantitySpinBox" name="boxWidth">
+              <property name="unit" stdset="0">
+               <string notr="true">mm</string>
+              </property>
+              <property name="maximum">
+               <double>1000.000000000000000</double>
+              </property>
+              <property name="value">
+               <double>10.000000000000000</double>
+              </property>
+             </widget>
+            </item>
             <item row="2" column="0">
              <widget class="QLabel" name="textLabel4">
               <property name="text">
@@ -189,50 +177,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="Gui::QuantitySpinBox" name="boxLength">
-              <property name="unit" stdset="0">
-               <string notr="true">mm</string>
-              </property>
-              <property name="minimum">
-               <double>0.000000000000000</double>
-              </property>
-              <property name="maximum">
-               <double>1000.000000000000000</double>
-              </property>
-              <property name="value">
-               <double>10.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="textLabel2">
-              <property name="text">
-               <string>Length:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="Gui::QuantitySpinBox" name="boxWidth">
-              <property name="unit" stdset="0">
-               <string notr="true">mm</string>
-              </property>
-              <property name="maximum">
-               <double>1000.000000000000000</double>
-              </property>
-              <property name="value">
-               <double>10.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="textLabel3">
-              <property name="text">
-               <string>Width:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            </layout>
           </item>
           <item row="1" column="0">
            <spacer>
@@ -285,7 +230,14 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="1" column="0">
+             <widget class="QLabel" name="textLabel6">
+              <property name="text">
+               <string>Length:</string>
+              </property>
+             </widget>
+            </item>
+           <item row="1" column="1">
              <widget class="Gui::QuantitySpinBox" name="cylinderLength">
               <property name="unit" stdset="0">
                <string notr="true">mm</string>
@@ -295,14 +247,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="textLabel6">
-              <property name="text">
-               <string>Length:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            </layout>
           </item>
           <item row="1" column="0">
            <widget class="Line" name="line1">
@@ -322,30 +267,6 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <item row="2" column="0" colspan="2">
-             <widget class="QCheckBox" name="cylinderClosed">
-              <property name="text">
-               <string>Closed</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="cylinderCount">
-              <property name="value">
-               <number>50</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="textLabel8">
-              <property name="text">
-               <string>Sampling:</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="textLabel7">
               <property name="text">
@@ -366,7 +287,31 @@
               </property>
              </widget>
             </item>
-           </layout>
+           <item row="1" column="0">
+             <widget class="QLabel" name="textLabel8">
+              <property name="text">
+               <string>Sampling:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="cylinderCount">
+              <property name="value">
+               <number>50</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0" colspan="2">
+             <widget class="QCheckBox" name="cylinderClosed">
+              <property name="text">
+               <string>Closed</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            </layout>
           </item>
           <item row="3" column="0">
            <spacer>
@@ -402,6 +347,30 @@
             <property name="spacing">
              <number>6</number>
             </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="textLabel9">
+              <property name="text">
+               <string>Radius 1:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="Gui::QuantitySpinBox" name="coneRadius1">
+              <property name="unit" stdset="0">
+               <string notr="true">mm</string>
+              </property>
+              <property name="value">
+               <double>2.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+           <item row="1" column="0">
+             <widget class="QLabel" name="textLabel10">
+              <property name="text">
+               <string>Radius 2:</string>
+              </property>
+             </widget>
+            </item>
             <item row="1" column="1" rowspan="2">
              <widget class="Gui::QuantitySpinBox" name="coneRadius2">
               <property name="unit" stdset="0">
@@ -429,31 +398,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="textLabel9">
-              <property name="text">
-               <string>Radius 1:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="textLabel10">
-              <property name="text">
-               <string>Radius 2:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="Gui::QuantitySpinBox" name="coneRadius1">
-              <property name="unit" stdset="0">
-               <string notr="true">mm</string>
-              </property>
-              <property name="value">
-               <double>2.000000000000000</double>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            </layout>
           </item>
           <item row="1" column="0">
            <widget class="Line" name="line2">
@@ -473,7 +418,14 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <item row="0" column="1">
+            <item row="0" column="0">
+             <widget class="QLabel" name="textLabel12">
+              <property name="text">
+               <string>Edge length:</string>
+              </property>
+             </widget>
+            </item>
+           <item row="0" column="1">
              <widget class="Gui::QuantitySpinBox" name="coneEdgeLength">
               <property name="unit" stdset="0">
                <string notr="true">mm</string>
@@ -490,6 +442,13 @@
               </property>
              </widget>
             </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="coneCount">
+              <property name="value">
+               <number>50</number>
+              </property>
+             </widget>
+            </item>
             <item row="2" column="0">
              <widget class="QCheckBox" name="coneClosed">
               <property name="text">
@@ -500,21 +459,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="coneCount">
-              <property name="value">
-               <number>50</number>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="textLabel12">
-              <property name="text">
-               <string>Edge length:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            </layout>
           </item>
           <item row="3" column="0">
            <spacer>
@@ -637,13 +582,20 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <item row="1" column="1">
-             <widget class="Gui::QuantitySpinBox" name="ellipsoidRadius2">
+            <item row="0" column="0">
+             <widget class="QLabel" name="textLabel16">
+              <property name="text">
+               <string>Radius 1:</string>
+              </property>
+             </widget>
+            </item>
+           <item row="0" column="1">
+             <widget class="Gui::QuantitySpinBox" name="ellipsoidRadius1">
               <property name="unit" stdset="0">
                <string notr="true">mm</string>
               </property>
               <property name="value">
-               <double>4.000000000000000</double>
+               <double>2.000000000000000</double>
               </property>
              </widget>
             </item>
@@ -654,24 +606,17 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="Gui::QuantitySpinBox" name="ellipsoidRadius1">
+            <item row="1" column="1">
+             <widget class="Gui::QuantitySpinBox" name="ellipsoidRadius2">
               <property name="unit" stdset="0">
                <string notr="true">mm</string>
               </property>
               <property name="value">
-               <double>2.000000000000000</double>
+               <double>4.000000000000000</double>
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="textLabel16">
-              <property name="text">
-               <string>Radius 1:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            </layout>
           </item>
           <item row="1" column="0">
            <widget class="Line" name="line4">
@@ -741,13 +686,6 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <item row="1" column="0">
-             <widget class="QLabel" name="textLabel20">
-              <property name="text">
-               <string>Radius 2:</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="textLabel19">
               <property name="text">
@@ -755,16 +693,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="Gui::QuantitySpinBox" name="toroidRadius2">
-              <property name="unit" stdset="0">
-               <string notr="true">mm</string>
-              </property>
-              <property name="value">
-               <double>2.000000000000000</double>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="Gui::QuantitySpinBox" name="toroidRadius1">
               <property name="unit" stdset="0">
@@ -775,7 +703,24 @@
               </property>
              </widget>
             </item>
-           </layout>
+           <item row="1" column="0">
+             <widget class="QLabel" name="textLabel20">
+              <property name="text">
+               <string>Radius 2:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="Gui::QuantitySpinBox" name="toroidRadius2">
+              <property name="unit" stdset="0">
+               <string notr="true">mm</string>
+              </property>
+              <property name="value">
+               <double>2.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            </layout>
           </item>
           <item row="1" column="0">
            <widget class="Line" name="line5">
@@ -834,7 +779,62 @@
      </layout>
     </widget>
    </item>
-  </layout>
+  <item row="1" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="createSolidButton">
+       <property name="text">
+        <string>&amp;Create</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+C</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonClose">
+       <property name="text">
+        <string>Cl&amp;ose</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+O</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
index a2a6a1a386..4ef9128154 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
@@ -22,6 +22,19 @@
      <layout class="QGridLayout">
       <item row="0" column="0">
        <layout class="QGridLayout">
+        <item row="0" column="0">
+         <widget class="QLabel" name="textLabel1">
+          <property name="toolTip">
+           <string>Deviation of tessellation to the actual surface</string>
+          </property>
+          <property name="whatsThis">
+           <string>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-weight:600;"&gt;Tessellation&lt;/span&gt;&lt;/p&gt;&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;span style=" font-weight:400;"&gt;Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="text">
+           <string>Maximum mesh deviation</string>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="1">
          <widget class="Gui::QuantitySpinBox" name="maxDeviationExport">
           <property name="toolTip">
@@ -44,19 +57,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="textLabel1">
-          <property name="toolTip">
-           <string>Deviation of tessellation to the actual surface</string>
-          </property>
-          <property name="whatsThis">
-           <string>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;span style=" font-weight:600;"&gt;Tessellation&lt;/span&gt;&lt;/p&gt;&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;/p&gt;&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"&gt;&lt;span style=" font-weight:400;"&gt;Defines the maximum deviation of the tessellated mesh to the surface. The smaller the value is the slower the render speed which results in increased detail/resolution.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>Maximum mesh deviation</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="Gui::PrefCheckBox" name="exportAmfCompressed">
           <property name="toolTip">
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui b/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
index 0937d3a732..0d3a635ac3 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.ui
@@ -40,33 +40,10 @@
         <property name="spacing">
          <number>6</number>
         </property>
-        <item row="1" column="2">
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>41</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="labelLineColor">
+        <item row="0" column="0">
+         <widget class="QLabel" name="labelFaceColor">
           <property name="text">
-           <string>Default line color</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="QLabel" name="labelMeshTransparency">
-          <property name="text">
-           <string>Mesh transparency</string>
+           <string>Default mesh color</string>
           </property>
          </widget>
         </item>
@@ -90,26 +67,26 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="4">
-         <widget class="Gui::PrefSpinBox" name="spinLineTransparency">
-          <property name="suffix">
-           <string>%</string>
+        <item row="0" column="2">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="maximum">
-           <number>100</number>
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
           </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>LineTransparency</cstring>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>41</width>
+            <height>20</height>
+           </size>
           </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Mesh</cstring>
-          </property>
-         </widget>
+         </spacer>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="labelFaceColor">
+       <item row="0" column="3">
+         <widget class="QLabel" name="labelMeshTransparency">
           <property name="text">
-           <string>Default mesh color</string>
+           <string>Mesh transparency</string>
           </property>
          </widget>
         </item>
@@ -129,55 +106,10 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="2" colspan="3">
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>191</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="3" column="1" colspan="4">
-         <widget class="Gui::PrefCheckBox" name="checkboxBoundbox">
-          <property name="toolTip">
-           <string>A bounding box will be displayed</string>
-          </property>
+        <item row="1" column="0">
+         <widget class="QLabel" name="labelLineColor">
           <property name="text">
-           <string>Show bounding-box for highlighted or selected meshes</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>ShowBoundingBox</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Mesh</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="Gui::PrefColorButton" name="buttonBackfaceColor">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="color">
-           <color>
-            <red>204</red>
-            <green>204</green>
-            <blue>204</blue>
-           </color>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>BackfaceColor</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Mesh</cstring>
+           <string>Default line color</string>
           </property>
          </widget>
         </item>
@@ -201,6 +133,85 @@
           </property>
          </widget>
         </item>
+        <item row="1" column="2">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>41</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="3">
+         <widget class="QLabel" name="labelLineTransparency">
+          <property name="text">
+           <string>Line transparency</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="Gui::PrefSpinBox" name="spinLineTransparency">
+          <property name="suffix">
+           <string>%</string>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>LineTransparency</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Mesh</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="labelBackfaceColor">
+          <property name="text">
+           <string>Backface color</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="Gui::PrefColorButton" name="buttonBackfaceColor">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="color">
+           <color>
+            <red>204</red>
+            <green>204</green>
+            <blue>204</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>BackfaceColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Mesh</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2" colspan="3">
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>191</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item row="3" column="0">
          <widget class="Gui::PrefCheckBox" name="checkboxRendering">
           <property name="toolTip">
@@ -223,37 +234,26 @@ will be used or black.</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="3">
-         <widget class="QLabel" name="labelLineTransparency">
+        <item row="3" column="1" colspan="4">
+         <widget class="Gui::PrefCheckBox" name="checkboxBoundbox">
+          <property name="toolTip">
+           <string>A bounding box will be displayed</string>
+          </property>
           <property name="text">
-           <string>Line transparency</string>
+           <string>Show bounding-box for highlighted or selected meshes</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>ShowBoundingBox</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Mesh</cstring>
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="labelBackfaceColor">
-          <property name="text">
-           <string>Backface color</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>41</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+        </layout>
       </item>
       <item row="0" column="1">
        <spacer>
@@ -286,16 +286,6 @@ will be used or black.</string>
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelAngle">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;This is the smallest angle between two faces where normals get calculated to do flat shading.&lt;/p&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Crease angle</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="Gui::PrefCheckBox" name="checkboxNormal">
         <property name="toolTip">
@@ -318,18 +308,15 @@ to a smoother appearance.
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelAngle">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;This is the smallest angle between two faces where normals get calculated to do flat shading.&lt;/p&gt;&lt;p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"&gt;If the angle between the normals of two neighbouring faces is less than the crease angle, the faces will be smoothshaded around their common edge.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>221</width>
-          <height>20</height>
-         </size>
+        <property name="text">
+         <string>Crease angle</string>
         </property>
-       </spacer>
+       </widget>
       </item>
       <item row="1" column="1">
        <widget class="Gui::PrefDoubleSpinBox" name="spinboxAngle">
@@ -356,6 +343,19 @@ to a smoother appearance.
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>221</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0" colspan="3">
        <widget class="QLabel" name="labelHint">
         <property name="text">
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.ui b/src/Mod/Mesh/Gui/RemoveComponents.ui
index 04dc1d1790..6a144b4061 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.ui
+++ b/src/Mod/Mesh/Gui/RemoveComponents.ui
@@ -26,30 +26,6 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="3" column="1" colspan="2">
-       <widget class="QCheckBox" name="cbSelectComp">
-        <property name="text">
-         <string>Select whole component</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QPushButton" name="selectTriangle">
-        <property name="text">
-         <string>Pick triangle</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QSpinBox" name="spSelectComp"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>&lt; faces than</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QPushButton" name="selectRegion">
         <property name="text">
@@ -57,13 +33,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QPushButton" name="selectComponents">
-        <property name="text">
-         <string>Components</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1" colspan="2">
        <spacer>
         <property name="orientation">
@@ -97,7 +66,38 @@
         </property>
        </spacer>
       </item>
-     </layout>
+     <item row="2" column="0">
+       <widget class="QPushButton" name="selectComponents">
+        <property name="text">
+         <string>Components</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>&lt; faces than</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QSpinBox" name="spSelectComp"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QPushButton" name="selectTriangle">
+        <property name="text">
+         <string>Pick triangle</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="QCheckBox" name="cbSelectComp">
+        <property name="text">
+         <string>Select whole component</string>
+        </property>
+       </widget>
+      </item>
+      </layout>
     </widget>
    </item>
    <item row="1" column="0">
@@ -112,43 +112,6 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="3" column="1" colspan="2">
-       <widget class="QCheckBox" name="cbDeselectComp">
-        <property name="text">
-         <string>Deselect whole component</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QPushButton" name="deselectTriangle">
-        <property name="text">
-         <string>Pick triangle</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QSpinBox" name="spDeselectComp"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>&gt; faces than</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>181</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="0" column="0">
        <widget class="QPushButton" name="deselectRegion">
         <property name="text">
@@ -176,6 +139,19 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1" colspan="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>181</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0">
        <widget class="QPushButton" name="deselectComponents">
         <property name="text">
@@ -183,7 +159,31 @@
         </property>
        </widget>
       </item>
-     </layout>
+     <item row="2" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>&gt; faces than</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QSpinBox" name="spDeselectComp"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QPushButton" name="deselectTriangle">
+        <property name="text">
+         <string>Pick triangle</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="QCheckBox" name="cbDeselectComp">
+        <property name="text">
+         <string>Deselect whole component</string>
+        </property>
+       </widget>
+      </item>
+      </layout>
     </widget>
    </item>
    <item row="2" column="0">
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.ui b/src/Mod/Mesh/Gui/SegmentationBestFit.ui
index 9c09115dfe..c777b53f46 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.ui
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.ui
@@ -14,59 +14,6 @@
    <string>Mesh segmentation</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBoxSph">
-     <property name="title">
-      <string>Sphere</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Tolerance</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QDoubleSpinBox" name="tolSph">
-        <property name="singleStep">
-         <double>0.010000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.010000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Minimum number of faces</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QSpinBox" name="numSph">
-        <property name="maximum">
-         <number>100000</number>
-        </property>
-        <property name="value">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="sphereParameters">
-        <property name="text">
-         <string>Parameters...</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBoxPln">
      <property name="title">
@@ -76,7 +23,14 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="planeParameters">
+        <property name="text">
+         <string>Parameters...</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Tolerance</string>
@@ -110,14 +64,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="planeParameters">
-        <property name="text">
-         <string>Parameters...</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      </layout>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
@@ -129,7 +76,14 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="1" column="0">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="cylinderParameters">
+        <property name="text">
+         <string>Parameters...</string>
+        </property>
+       </widget>
+      </item>
+     <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Tolerance</string>
@@ -163,17 +117,63 @@
         </property>
        </widget>
       </item>
+      </layout>
+    </widget>
+   </item>
+  <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxSph">
+     <property name="title">
+      <string>Sphere</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="1">
-       <widget class="QPushButton" name="cylinderParameters">
+       <widget class="QPushButton" name="sphereParameters">
         <property name="text">
          <string>Parameters...</string>
         </property>
        </widget>
       </item>
-     </layout>
+     <item row="1" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Tolerance</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QDoubleSpinBox" name="tolSph">
+        <property name="singleStep">
+         <double>0.010000000000000</double>
+        </property>
+        <property name="value">
+         <double>0.010000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Minimum number of faces</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="numSph">
+        <property name="maximum">
+         <number>100000</number>
+        </property>
+        <property name="value">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      </layout>
     </widget>
    </item>
-  </layout>
+   </layout>
  </widget>
  <resources/>
  <connections/>