diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 0b143b89e..a04719c33 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -2,32 +2,12 @@
 <ui version="4.0">
  <class>PasswordGeneratorWidget</class>
  <widget class="QWidget" name="PasswordGeneratorWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>575</width>
-    <height>305</height>
-   </rect>
-  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>284</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string/>
   </property>
@@ -188,17 +168,11 @@ QProgressBar::chunk {
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
        <property name="tabPosition">
         <enum>QTabWidget::North</enum>
        </property>
@@ -225,12 +199,6 @@ QProgressBar::chunk {
                <layout class="QHBoxLayout" name="alphabetLayout" stretch="0,0,0,0,1,0">
                 <item>
                  <widget class="QToolButton" name="checkBoxUpper">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -256,12 +224,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxLower">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -287,12 +249,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxNumbers">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -318,12 +274,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxSpecialChars">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -349,12 +299,6 @@ QProgressBar::chunk {
                 </item>
                 <item>
                  <widget class="QToolButton" name="checkBoxExtASCII">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
@@ -578,7 +522,7 @@ QProgressBar::chunk {
              <item row="2" column="1">
               <widget class="QLineEdit" name="editWordSeparator">
                <property name="text">
-                <string> </string>
+                <string/>
                </property>
               </widget>
              </item>
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index c22d4b8b1..afc1d4f26 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -2,20 +2,6 @@
 <ui version="4.0">
  <class>EditEntryWidgetMain</class>
  <widget class="QWidget" name="EditEntryWidgetMain">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>692</width>
-    <height>323</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="topMargin">
     <number>0</number>
@@ -34,20 +20,7 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
+    <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true"/>
    </item>
    <item row="2" column="0" alignment="Qt::AlignRight">
     <widget class="QLabel" name="passwordLabel">