diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
index dfc9a0af04..5ac1b539e6 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>499</width>
+    <width>546</width>
     <height>897</height>
    </rect>
   </property>
@@ -267,6 +267,9 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Font for labels</string>
           </property>
+          <property name="sizeAdjustPolicy">
+           <enum>QComboBox::AdjustToContents</enum>
+          </property>
           <property name="currentFont">
            <font/>
           </property>
@@ -397,6 +400,9 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Use first- or third-angle multiview projection convention</string>
           </property>
+          <property name="sizeAdjustPolicy">
+           <enum>QComboBox::AdjustToContents</enum>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>ProjectionAngle</cstring>
           </property>
@@ -478,14 +484,14 @@ for ProjectionGroups</string>
    <item>
     <widget class="QGroupBox" name="gb_Templates">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
-       <width>0</width>
+       <width>481</width>
        <height>225</height>
       </size>
      </property>
@@ -494,7 +500,7 @@ for ProjectionGroups</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,0,0">
+       <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,0,2">
         <item row="1" column="1" rowspan="2">
          <spacer name="horizontalSpacer_7">
           <property name="orientation">
@@ -528,6 +534,12 @@ for ProjectionGroups</string>
         </item>
         <item row="2" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>191</width>
@@ -547,6 +559,12 @@ for ProjectionGroups</string>
         </item>
         <item row="3" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>191</width>
@@ -567,8 +585,8 @@ for ProjectionGroups</string>
         <item row="0" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
@@ -609,6 +627,12 @@ for ProjectionGroups</string>
         </item>
         <item row="5" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>191</width>
@@ -628,6 +652,12 @@ for ProjectionGroups</string>
         </item>
         <item row="4" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_Welding">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>191</width>
@@ -650,6 +680,12 @@ for ProjectionGroups</string>
         </item>
         <item row="1" column="2">
          <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>191</width>
@@ -685,6 +721,12 @@ for ProjectionGroups</string>
         </item>
         <item row="7" column="2">
          <widget class="Gui::PrefFileChooser" name="fcSymbolDir">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="toolTip">
            <string>Alternate directory to search for Svg symbol files.</string>
           </property>
@@ -745,8 +787,8 @@ for ProjectionGroups</string>
         <item row="6" column="2">
          <widget class="Gui::PrefLineEdit" name="le_NamePattern">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>1</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>