diff --git a/share/icons/icons.qrc b/share/icons/icons.qrc
index d61251848..0e1150b6c 100644
--- a/share/icons/icons.qrc
+++ b/share/icons/icons.qrc
@@ -9,6 +9,7 @@
         <file>application/scalable/actions/auto-type.svg</file>
         <file>application/scalable/actions/bugreport.svg</file>
         <file>application/scalable/actions/chronometer.svg</file>
+        <file>application/scalable/actions/clipboard-text.svg</file>
         <file>application/scalable/actions/configure.svg</file>
         <file>application/scalable/actions/database-change-key.svg</file>
         <file>application/scalable/actions/database-lock.svg</file>
@@ -49,6 +50,7 @@
         <file>application/scalable/actions/password-generator.svg</file>
         <file>application/scalable/actions/password-show-off.svg</file>
         <file>application/scalable/actions/password-show-on.svg</file>
+        <file>application/scalable/actions/refresh.svg</file>
         <file>application/scalable/actions/sort-alphabetical-ascending.svg</file>
         <file>application/scalable/actions/sort-alphabetical-descending.svg</file>
         <file>application/scalable/actions/statistics.svg</file>
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index c65cc987a..9bf0eae32 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -195,6 +195,19 @@
         <property name="rightMargin">
          <number>60</number>
         </property>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="PasswordGeneratorWidget" name="passwordGeneratorWidget" native="true">
           <property name="focusPolicy">
diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordEdit.cpp
index 516d98e23..627f79c5e 100644
--- a/src/gui/PasswordEdit.cpp
+++ b/src/gui/PasswordEdit.cpp
@@ -57,7 +57,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
     setFont(passwordFont);
 
     m_toggleVisibleAction = new QAction(
-        resources()->icon("password-show"),
+        resources()->icon("password-show-off"),
         tr("Toggle Password (%1)").arg(QKeySequence(Qt::CTRL + Qt::Key_H).toString(QKeySequence::NativeText)),
         nullptr);
     m_toggleVisibleAction->setCheckable(true);
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index 8a3032447..cb1931372 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -103,7 +103,8 @@ PasswordGeneratorWidget::~PasswordGeneratorWidget()
 {
 }
 
-PasswordGeneratorWidget* PasswordGeneratorWidget::popupGenerator(QWidget* parent) {
+PasswordGeneratorWidget* PasswordGeneratorWidget::popupGenerator(QWidget* parent)
+{
     auto pwGenerator = new PasswordGeneratorWidget(parent);
     pwGenerator->setWindowModality(Qt::ApplicationModal);
     pwGenerator->setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint);
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 8ffb91240..9323590f0 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>622</width>
-    <height>433</height>
+    <height>455</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -155,8 +155,21 @@ QProgressBar::chunk {
        </property>
       </widget>
      </item>
+     <item row="0" column="1">
+      <widget class="QToolButton" name="buttonGenerate">
+       <property name="focusPolicy">
+        <enum>Qt::TabFocus</enum>
+       </property>
+       <property name="accessibleDescription">
+        <string>Regenerate password</string>
+       </property>
+       <property name="shortcut">
+        <string notr="true">Ctrl+R</string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="2">
-      <widget class="QPushButton" name="buttonCopy">
+      <widget class="QToolButton" name="buttonCopy">
        <property name="focusPolicy">
         <enum>Qt::TabFocus</enum>
        </property>
@@ -171,19 +184,6 @@ QProgressBar::chunk {
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="buttonGenerate">
-       <property name="focusPolicy">
-        <enum>Qt::TabFocus</enum>
-       </property>
-       <property name="accessibleDescription">
-        <string>Regenerate password</string>
-       </property>
-       <property name="shortcut">
-        <string notr="true">Ctrl+R</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>