diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.ui b/src/Gui/PreferencePages/DlgSettingsNavigation.ui
index 9e933f3638..7ef04c9312 100644
--- a/src/Gui/PreferencePages/DlgSettingsNavigation.ui
+++ b/src/Gui/PreferencePages/DlgSettingsNavigation.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>516</width>
-    <height>687</height>
+    <width>548</width>
+    <height>762</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -65,7 +65,7 @@
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>91</width>
+          <width>20</width>
           <height>20</height>
          </size>
         </property>
@@ -217,6 +217,9 @@
         <property name="toolTip">
          <string>Opacity of the navigation cube when not focused</string>
         </property>
+        <property name="suffix">
+         <string notr="true">%</string>
+        </property>
         <property name="minimum">
          <number>1</number>
         </property>
@@ -226,9 +229,6 @@
         <property name="value">
          <number>50</number>
         </property>
-        <property name="suffix">
-         <string notr="true">%</string>
-        </property>
         <property name="prefEntry" stdset="0">
          <cstring>InactiveOpacity</cstring>
         </property>
@@ -249,7 +249,7 @@
         <property name="toolTip">
          <string>Base color for all elements</string>
         </property>
-        <property name="color">
+        <property name="color" stdset="0">
          <color alpha="128">
           <red>226</red>
           <green>232</green>
@@ -305,16 +305,16 @@
          <number>1</number>
         </property>
         <property name="minimum">
-         <double>1.0</double>
+         <double>1.000000000000000</double>
         </property>
         <property name="maximum">
-         <double>100.0</double>
+         <double>100.000000000000000</double>
         </property>
         <property name="singleStep">
-         <double>0.5</double>
+         <double>0.500000000000000</double>
         </property>
         <property name="value">
-         <double>5.0</double>
+         <double>5.000000000000000</double>
         </property>
         <property name="prefEntry" stdset="0">
          <cstring>RotationCenterSize</cstring>
diff --git a/src/Mod/Part/Gui/DlgExportStep.ui b/src/Mod/Part/Gui/DlgExportStep.ui
index 4f032b90b1..88a5c67916 100644
--- a/src/Mod/Part/Gui/DlgExportStep.ui
+++ b/src/Mod/Part/Gui/DlgExportStep.ui
@@ -20,27 +20,21 @@
       <string>Export</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Scheme</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Units for export of STEP</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="2">
+      <item row="5" column="1">
        <widget class="QComboBox" name="comboBoxUnits">
         <item>
          <property name="text">
@@ -59,30 +53,49 @@
         </item>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QCheckBox" name="checkBoxPcurves">
-        <property name="text">
-         <string>Write out curves in parametric space of surface</string>
-        </property>
+      <item row="6" column="1">
+       <widget class="QComboBox" name="comboBoxSchema">
+        <item>
+         <property name="text">
+          <string notr="true">AP203</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">AP214 Committee Draft</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">AP214 Draft International Standard</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">AP214 International Standard</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string notr="true">AP242 Draft International Standard</string>
+         </property>
+        </item>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
-        <property name="toolTip">
-         <string>Uncheck this to skip invisible objects when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
-        </property>
+      <item row="4" column="0" colspan="2">
+       <widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
         <property name="text">
-         <string>Export invisible objects</string>
+         <string>Use legacy export function</string>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>ExportHiddenObject</cstring>
+         <cstring>ExportLegacy</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/Import</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
+      <item row="3" column="0">
        <widget class="Gui::PrefCheckBox" name="checkBoxKeepPlacement">
         <property name="toolTip">
          <string>Check this option to keep the placement information when exporting
@@ -101,55 +114,27 @@ it inside the Placement property.</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
+      <item row="2" column="0" colspan="2">
+       <widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
+        <property name="toolTip">
+         <string>Uncheck this to skip invisible objects when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
+        </property>
         <property name="text">
-         <string>Use legacy export function</string>
+         <string>Export invisible objects</string>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>ExportLegacy</cstring>
+         <cstring>ExportHiddenObject</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/Import</cstring>
         </property>
        </widget>
       </item>
-      <item row="6" column="0" colspan="3">
-       <widget class="QGroupBox" name="groupBox_2">
-        <property name="title">
-         <string>Scheme</string>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="checkBoxPcurves">
+        <property name="text">
+         <string>Write out curves in parametric space of surface</string>
         </property>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QComboBox" name="comboBoxSchema">
-           <item>
-            <property name="text">
-             <string notr="true">AP203</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">AP214 Committee Draft</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">AP214 Draft International Standard</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">AP214 International Standard</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string notr="true">AP242 Draft International Standard</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
        </widget>
       </item>
      </layout>
@@ -165,7 +150,6 @@ it inside the Placement property.</string>
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>comboBoxUnits</tabstop>
   <tabstop>checkBoxPcurves</tabstop>
   <tabstop>checkBoxExportHiddenObj</tabstop>
  </tabstops>