diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index b7413f56b..29c2e18c3 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>278</height>
+    <width>575</width>
+    <height>284</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,10 +16,25 @@
     <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>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
    <item>
     <layout class="QGridLayout" name="passwordFieldLayout">
      <property name="bottomMargin">
@@ -235,12 +250,6 @@ QProgressBar::chunk {
          <layout class="QHBoxLayout" name="alphabetLayout">
           <item>
            <widget class="QToolButton" name="checkBoxUpper">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>26</height>
-             </size>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
@@ -260,12 +269,6 @@ QProgressBar::chunk {
           </item>
           <item>
            <widget class="QToolButton" name="checkBoxLower">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>26</height>
-             </size>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
@@ -285,12 +288,6 @@ QProgressBar::chunk {
           </item>
           <item>
            <widget class="QToolButton" name="checkBoxNumbers">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>26</height>
-             </size>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
@@ -310,12 +307,6 @@ QProgressBar::chunk {
           </item>
           <item>
            <widget class="QToolButton" name="checkBoxSpecialChars">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>26</height>
-             </size>
-            </property>
             <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index f2372a0d5..66fdc9096 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -77,6 +77,8 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
 
     connect(this, SIGNAL(accepted()), SLOT(saveEntry()));
     connect(this, SIGNAL(rejected()), SLOT(cancel()));
+    
+    m_mainUi->passwordGenerator->layout()->setContentsMargins(0, 0, 0, 0);
 }
 
 EditEntryWidget::~EditEntryWidget()
diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui
index e3288a33f..59f7d0e0a 100644
--- a/src/gui/entry/EditEntryWidgetAutoType.ui
+++ b/src/gui/entry/EditEntryWidgetAutoType.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>567</width>
-    <height>347</height>
+    <height>348</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -37,14 +37,14 @@
    <item>
     <widget class="QRadioButton" name="inheritSequenceButton">
      <property name="text">
-      <string>Inherit default Auto-Type sequence from the group</string>
+      <string>Inherit default Auto-Type sequence from the &amp;group</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QRadioButton" name="customSequenceButton">
      <property name="text">
-      <string>Use custom Auto-Type sequence:</string>
+      <string>&amp;Use custom Auto-Type sequence:</string>
      </property>
     </widget>
    </item>
@@ -90,39 +90,7 @@
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QPushButton" name="assocAddButton">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>+</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="assocRemoveButton">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>-</string>
-           </property>
-          </widget>
-         </item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2,1,1">
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
@@ -136,6 +104,44 @@
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="QToolButton" name="assocAddButton">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>1</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>35</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>+</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="assocRemoveButton">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -171,14 +177,14 @@
        <item>
         <widget class="QRadioButton" name="defaultWindowSequenceButton">
          <property name="text">
-          <string>Use default sequence</string>
+          <string>Use default se&amp;quence</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="customWindowSequenceButton">
          <property name="text">
-          <string>Set custom sequence:</string>
+          <string>Set custo&amp;m sequence:</string>
          </property>
         </widget>
        </item>
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index b896963c0..adc3ea247 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -6,35 +6,41 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>372</width>
-    <height>364</height>
+    <width>692</width>
+    <height>323</height>
    </rect>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::ExpandingFieldsGrow</enum>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="titleLabel">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="5" column="0" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="urlLabel">
      <property name="text">
-      <string>Title:</string>
+      <string>URL:</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="titleEdit"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="usernameLabel">
-     <property name="text">
-      <string>Username:</string>
+   <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>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="usernameEdit"/>
-   </item>
-   <item row="3" column="0">
+   <item row="2" column="0" alignment="Qt::AlignRight">
     <widget class="QLabel" name="passwordLabel">
      <property name="text">
       <string>Password:</string>
@@ -42,31 +48,6 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="PasswordEdit" name="passwordEdit">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="togglePasswordButton">
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="passwordRepeatLabel">
-     <property name="text">
-      <string>Repeat:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="PasswordEdit" name="passwordRepeatEdit">
@@ -84,24 +65,46 @@
      </item>
     </layout>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="urlLabel">
+   <item row="2" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="PasswordEdit" name="passwordEdit">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="togglePasswordButton">
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="passwordRepeatLabel">
      <property name="text">
-      <string>URL:</string>
+      <string>Repeat:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="titleLabel">
+     <property name="text">
+      <string>Title:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
+    <widget class="QLabel" name="notesLabel">
+     <property name="text">
+      <string>Notes:</string>
      </property>
     </widget>
    </item>
    <item row="7" column="1">
-    <widget class="QLineEdit" name="urlEdit"/>
-   </item>
-   <item row="8" column="0">
-    <widget class="QCheckBox" name="expireCheck">
-     <property name="text">
-      <string>Expires</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QDateTimeEdit" name="expireDatePicker">
@@ -115,6 +118,12 @@
      </item>
      <item>
       <widget class="QPushButton" name="expirePresets">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Presets</string>
        </property>
@@ -122,13 +131,6 @@
      </item>
     </layout>
    </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="notesLabel">
-     <property name="text">
-      <string>Notes:</string>
-     </property>
-    </widget>
-   </item>
    <item row="9" column="1">
     <widget class="QPlainTextEdit" name="notesEdit">
      <property name="sizePolicy">
@@ -139,8 +141,28 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true"/>
+   <item row="1" column="0" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="usernameLabel">
+     <property name="text">
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="titleEdit"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="usernameEdit"/>
+   </item>
+   <item row="5" column="1">
+    <widget class="QLineEdit" name="urlEdit"/>
+   </item>
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="expireCheck">
+     <property name="text">
+      <string>Expires</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -165,7 +187,6 @@
   <tabstop>togglePasswordButton</tabstop>
   <tabstop>togglePasswordGeneratorButton</tabstop>
   <tabstop>urlEdit</tabstop>
-  <tabstop>expireCheck</tabstop>
   <tabstop>expireDatePicker</tabstop>
   <tabstop>expirePresets</tabstop>
   <tabstop>notesEdit</tabstop>