diff --git a/src/edt/edt/EditorOptionsPath.ui b/src/edt/edt/EditorOptionsPath.ui
index cf8a30249..0b2769df6 100644
--- a/src/edt/edt/EditorOptionsPath.ui
+++ b/src/edt/edt/EditorOptionsPath.ui
@@ -18,16 +18,16 @@
     <number>6</number>
    </property>
    <property name="leftMargin">
-    <number>9</number>
+    <number>4</number>
    </property>
    <property name="topMargin">
-    <number>9</number>
+    <number>4</number>
    </property>
    <property name="rightMargin">
-    <number>9</number>
+    <number>4</number>
    </property>
    <property name="bottomMargin">
-    <number>9</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QFrame" name="frame_2">
@@ -106,20 +106,23 @@
      </property>
      <layout class="QGridLayout">
       <property name="leftMargin">
-       <number>9</number>
+       <number>4</number>
       </property>
       <property name="topMargin">
-       <number>9</number>
+       <number>4</number>
       </property>
       <property name="rightMargin">
-       <number>9</number>
+       <number>4</number>
       </property>
       <property name="bottomMargin">
-       <number>9</number>
+       <number>4</number>
       </property>
-      <property name="spacing">
+      <property name="horizontalSpacing">
        <number>6</number>
       </property>
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
       <item row="0" column="4" rowspan="3">
        <spacer>
         <property name="orientation">
@@ -128,7 +131,7 @@
         <property name="sizeHint" stdset="0">
          <size>
           <width>21</width>
-          <height>81</height>
+          <height>10</height>
          </size>
         </property>
        </spacer>
diff --git a/src/edt/edt/EditorOptionsText.ui b/src/edt/edt/EditorOptionsText.ui
index 3008d9de8..bd19c5e98 100644
--- a/src/edt/edt/EditorOptionsText.ui
+++ b/src/edt/edt/EditorOptionsText.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>EditorOptionsText</class>
- <widget class="QWidget" name="EditorOptionsText" >
-  <property name="geometry" >
+ <widget class="QWidget" name="EditorOptionsText">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,194 +10,204 @@
     <height>243</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>2</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="leftMargin">
+    <number>4</number>
+   </property>
+   <property name="topMargin">
+    <number>4</number>
+   </property>
+   <property name="rightMargin">
+    <number>4</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
    </property>
    <item>
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
+     <layout class="QGridLayout">
+      <property name="leftMargin">
+       <number>4</number>
       </property>
-      <property name="spacing" >
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
+       <number>4</number>
+      </property>
+      <property name="horizontalSpacing">
        <number>6</number>
       </property>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
          <string>Alignment</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QLabel" name="label_8" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>5</vsizetype>
+      <item row="2" column="1">
+       <widget class="QLabel" name="label_8">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>h =</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="Text size" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QLabel" name="Text size">
+        <property name="text">
          <string>Text size</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="4" >
-       <widget class="QLineEdit" name="text_le" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="0" column="1" colspan="4">
+       <widget class="QLineEdit" name="text_le">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="label_2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>5</vsizetype>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Text</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="4" >
-       <widget class="QLabel" name="label_3" >
-        <property name="text" >
-         <string>Hint: orientation, alignments and size cannot be saved to OASIS files
-Enable a vector font and text scaling in the setup dialog 
-to show text objects scaled and rotated</string>
+      <item row="4" column="1" colspan="4">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Hint: orientation, alignments and size cannot be saved to OASIS files. Enable a vector font and text scaling in the setup dialog to show text objects scaled and rotated.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QLineEdit" name="size_le" />
+      <item row="3" column="1" colspan="2">
+       <widget class="QLineEdit" name="size_le"/>
       </item>
-      <item row="3" column="3" colspan="2" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>(Leave empty for default)</string>
+      <item row="3" column="3" colspan="2">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>(empty for default)</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="4" >
-       <widget class="QComboBox" name="valign_cbx" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="2" column="4">
+       <widget class="QComboBox" name="valign_cbx">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>(Default)</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Top</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Center</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Bottom</string>
          </property>
         </item>
        </widget>
       </item>
-      <item row="2" column="3" >
-       <widget class="QLabel" name="label_9" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>5</vsizetype>
+      <item row="2" column="3">
+       <widget class="QLabel" name="label_9">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>v =</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QComboBox" name="halign_cbx" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="halign_cbx">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>(Default)</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Left</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Center</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Right</string>
          </property>
         </item>
        </widget>
       </item>
-      <item row="1" column="0" colspan="5" >
+      <item row="1" column="0" colspan="5">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Fixed</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>5</height>
@@ -209,10 +220,10 @@ to show text objects scaled and rotated</string>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>