diff --git a/src/passworddialog.h b/src/passworddialog.h
--- a/src/passworddialog.h
+++ b/src/passworddialog.h
@@ -63,10 +63,10 @@
     void setPass(const QString &output);
 
 private Q_SLOTS:
-    void showPasswordChanged(int arg1);
     void createPassword();
     void dialogAccepted();
     void dialogCancelled();
+    void togglePasswordGenerationOption(bool checked);
 
 private:
     std::unique_ptr<Ui::PasswordDialog> ui;
diff --git a/src/passworddialog.cpp b/src/passworddialog.cpp
--- a/src/passworddialog.cpp
+++ b/src/passworddialog.cpp
@@ -38,6 +38,8 @@
     setPasswordCharTemplate(m_passConfig.selected);
 
     connect(&m_pass, &Pass::finishedShow, this, &PasswordDialog::setPass);
+    connect(ui->createPasswordOptionsButton, &QAbstractButton::toggled, this, &PasswordDialog::togglePasswordGenerationOption);
+    togglePasswordGenerationOption(false);
 }
 
 /**
@@ -71,7 +73,8 @@
     connect(this, &PasswordDialog::accepted, this, &PasswordDialog::dialogAccepted);
     connect(this, &PasswordDialog::rejected, this, &PasswordDialog::dialogCancelled);
     connect(ui->createPasswordButton, &QAbstractButton::clicked, this, &PasswordDialog::createPassword);
-    connect(ui->checkBoxShow, &QCheckBox::stateChanged, this, &PasswordDialog::showPasswordChanged);
+    connect(ui->createPasswordOptionsButton, &QAbstractButton::toggled, this, &PasswordDialog::togglePasswordGenerationOption);
+    togglePasswordGenerationOption(false);
 }
 
 /**
@@ -79,18 +82,6 @@
  */
 PasswordDialog::~PasswordDialog() = default;
 
-/**
- * @brief PasswordDialog::on_checkBoxShow_stateChanged hide or show passwords.
- * @param arg1
- */
-void PasswordDialog::showPasswordChanged(int arg1)
-{
-    if (arg1)
-        ui->lineEditPassword->setEchoMode(QLineEdit::Normal);
-    else
-        ui->lineEditPassword->setEchoMode(QLineEdit::Password);
-}
-
 /**
  * @brief PasswordDialog::on_createPasswordButton_clicked generate a random
  * passwords.
@@ -98,12 +89,12 @@
  */
 void PasswordDialog::createPassword()
 {
-    ui->widget->setEnabled(false);
+    setEnabled(false);
     QString newPass = m_pass.Generate_b(static_cast<unsigned int>(ui->spinBox_pwdLength->value()),
                                         m_passConfig.Characters[static_cast<PasswordConfiguration::characterSet>(ui->passwordTemplateSwitch->currentIndex())]);
     if (newPass.length() > 0)
-        ui->lineEditPassword->setText(newPass);
-    ui->widget->setEnabled(true);
+        ui->lineEditPassword->setPassword(newPass);
+    setEnabled(true);
 }
 
 /**
@@ -136,9 +127,9 @@
 void PasswordDialog::setPassword(const QString& password)
 {
     FileContent fileContent = FileContent::parse(password, m_templating ? m_fields : QStringList(), m_allFields);
-    ui->lineEditPassword->setText(fileContent.getPassword());
+    ui->lineEditPassword->setPassword(fileContent.getPassword());
 
-    QWidget *previous = ui->checkBoxShow;
+    QWidget *previous = ui->createPasswordButton;
     // first set templated values
     NamedValues namedValues = fileContent.getNamedValues();
     for (QLineEdit *line : std::as_const(templateLines)) {
@@ -167,7 +158,7 @@
  */
 QString PasswordDialog::getPassword()
 {
-    QString passFile = ui->lineEditPassword->text() + QLatin1Char('\n');
+    QString passFile = ui->lineEditPassword->password() + QLatin1Char('\n');
     QList<QLineEdit *> allLines(templateLines);
     allLines.append(otherLines);
     for (QLineEdit *line : allLines) {
@@ -191,13 +182,13 @@
     templateLines.clear();
 
     if (m_templating) {
-        QWidget *previous = ui->checkBoxShow;
+        QWidget *previous = ui->createPasswordButton;
         for (const QString &field : std::as_const(m_fields)) {
             if (field.isEmpty())
                 continue;
             auto *line = new QLineEdit();
             line->setObjectName(field);
-            ui->formLayout->addRow(new QLabel(field), line);
+            ui->formLayout->addRow(new QLabel(i18nc("Field name", "%1:", field)), line);
             setTabOrder(previous, line);
             templateLines.append(line);
             previous = line;
@@ -240,3 +231,24 @@
     setPassword(output);
     //    TODO(bezet): enable ui
 }
+
+void PasswordDialog::togglePasswordGenerationOption(bool checked)
+{
+    if (checked) {
+        ui->createPasswordOptionsButton->setIcon(QIcon::fromTheme(QStringLiteral("collapse-symbolic")));
+        ui->createPasswordOptionsButton->setToolTip(i18nc("@info:tooltip", "Collapse password options"));
+        ui->createPasswordOptionsButton->setAccessibleName(i18nc("@info:tooltip", "Collapse password options"));
+        ui->label_characterset->setVisible(true);
+        ui->passwordTemplateSwitch->setVisible(true);
+        ui->label_length->setVisible(true);
+        ui->spinBox_pwdLength->setVisible(true);
+    } else {
+        ui->createPasswordOptionsButton->setIcon(QIcon::fromTheme(QStringLiteral("expand-symbolic")));
+        ui->createPasswordOptionsButton->setToolTip(i18nc("@info:tooltip", "Toggle password options"));
+        ui->createPasswordOptionsButton->setAccessibleName(i18nc("@info:tooltip", "Toggle password options"));
+        ui->label_characterset->setVisible(false);
+        ui->passwordTemplateSwitch->setVisible(false);
+        ui->label_length->setVisible(false);
+        ui->spinBox_pwdLength->setVisible(false);
+    }
+}
diff --git a/src/passworddialog.ui b/src/passworddialog.ui
--- a/src/passworddialog.ui
+++ b/src/passworddialog.ui
@@ -27,153 +27,141 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="leftMargin">
+      <number>0</number>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLineEdit" name="lineEditPassword">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="echoMode">
-           <enum>QLineEdit::Password</enum>
-          </property>
-          <property name="placeholderText">
-           <string>Password</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="createPasswordButton">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Generate</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QCheckBox" name="checkBoxShow">
-          <property name="text">
-           <string>Show password</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_characterset">
-          <property name="text">
-           <string>Character Set:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="passwordTemplateSwitch">
-          <item>
-           <property name="text">
-            <string>All Characters</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Alphabetical</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Alphanumerical</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_length">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Length:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="spinBox_pwdLength">
-          <property name="minimum">
-           <number>8</number>
-          </property>
-          <property name="maximum">
-           <number>255</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QFormLayout" name="formLayout">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <property name="labelAlignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-        <property name="formAlignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel">
+       <property name="text">
+        <string>Password:</string>
+       </property>
+       <property name="buddy">
+        <cstring>lineEditPassword</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="KPasswordLineEdit" name="lineEditPassword">
+         <property name="revealPasswordMode">
+          <enum>KPassword::RevealMode::Always</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="createPasswordButton">
+         <property name="text">
+          <string>Generate</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="createPasswordOptionsButton">
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="icon">
+           <iconset theme="expand-symbolic" />
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_characterset">
+       <property name="text">
+        <string>Character Set:</string>
+       </property>
+       <property name="buddy">
+        <cstring>passwordTemplateSwitch</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="passwordTemplateSwitch">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>All Characters</string>
         </property>
-       </layout>
-      </item>
-      <item>
-       <widget class="QPlainTextEdit" name="plainTextEdit"/>
-      </item>
-      <item>
-       <widget class="QDialogButtonBox" name="buttonBox">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+       </item>
+       <item>
+        <property name="text">
+         <string>Alphabetical</string>
         </property>
-        <property name="standardButtons">
-         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </item>
+       <item>
+        <property name="text">
+         <string>Alphanumerical</string>
         </property>
-       </widget>
-      </item>
-     </layout>
+       </item>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_length">
+       <property name="text">
+        <string>Length:</string>
+       </property>
+       <property name="buddy">
+        <cstring>spinBox_pwdLength</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="spinBox_pwdLength">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>8</number>
+       </property>
+       <property name="maximum">
+        <number>255</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel">
+     <property name="text">
+      <string>Additional Notes:</string>
+     </property>
+     <property name="buddy">
+      <cstring>plainTextEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPlainTextEdit" name="plainTextEdit"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
     </widget>
    </item>
   </layout>
@@ -181,7 +169,6 @@
  <tabstops>
   <tabstop>lineEditPassword</tabstop>
   <tabstop>createPasswordButton</tabstop>
-  <tabstop>checkBoxShow</tabstop>
   <tabstop>passwordTemplateSwitch</tabstop>
   <tabstop>spinBox_pwdLength</tabstop>
   <tabstop>plainTextEdit</tabstop>