diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index c57dfa5540..9bb69c0620 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -6846,10 +6846,6 @@ The following data is missing:
         <source>Word Count:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Character Count:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Word Case:</source>
         <translation type="unfinished"></translation>
@@ -6862,10 +6858,6 @@ The following data is missing:
         <source>Add custom wordlist</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>character</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index 3bb47d2d0b..f0f48f61a8 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -277,7 +277,6 @@ void PasswordGeneratorWidget::updatePasswordStrength()
     PasswordHealth passwordHealth(0);
     if (m_ui->tabWidget->currentIndex() == Diceware) {
         passwordHealth.init(m_dicewareGenerator->estimateEntropy());
-        m_ui->charactersInPassphraseLabel->setText(QString::number(m_ui->editNewPassword->text().length()));
     } else {
         passwordHealth = PasswordHealth(m_ui->editNewPassword->text());
     }
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 34dab2c36c..47f197c816 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -769,26 +769,6 @@ QProgressBar::chunk {
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
         <layout class="QGridLayout" name="gridLayout_3">
-         <item row="2" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordSeparator">
-           <property name="text">
-            <string>Word Separator:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordList">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Wordlist:</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <property name="sizeConstraint">
@@ -834,29 +814,59 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
-         <item row="1" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordCount">
+         <item row="3" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="wordCaseLabel">
            <property name="text">
-            <string>Word Count:</string>
-           </property>
-           <property name="buddy">
-            <cstring>spinBoxLength</cstring>
+            <string>Word Case:</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="characterCountLabel">
+         <item row="2" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordSeparator">
            <property name="text">
-            <string>Character Count:</string>
+            <string>Word Separator:</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="wordCaseLabel">
-           <property name="text">
-            <string>Word Case:</string>
-           </property>
-          </widget>
+         <item row="0" column="2">
+          <layout class="QHBoxLayout" name="horizontalLayout_10">
+           <item>
+            <widget class="QComboBox" name="comboBoxWordList">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonDeleteWordList">
+             <property name="focusPolicy">
+              <enum>Qt::TabFocus</enum>
+             </property>
+             <property name="toolTip">
+              <string>Delete selected wordlist</string>
+             </property>
+             <property name="accessibleDescription">
+              <string>Delete selected wordlist</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonAddWordList">
+             <property name="focusPolicy">
+              <enum>Qt::TabFocus</enum>
+             </property>
+             <property name="toolTip">
+              <string>Add custom wordlist</string>
+             </property>
+             <property name="accessibleDescription">
+              <string>Add custom wordlist</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item row="3" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -878,6 +888,16 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
+         <item row="1" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordCount">
+           <property name="text">
+            <string>Word Count:</string>
+           </property>
+           <property name="buddy">
+            <cstring>spinBoxLength</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_9">
            <item>
@@ -914,50 +934,16 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
-         <item row="0" column="2">
-          <layout class="QHBoxLayout" name="horizontalLayout_10">
-           <item>
-            <widget class="QComboBox" name="comboBoxWordList">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonDeleteWordList">
-             <property name="focusPolicy">
-              <enum>Qt::TabFocus</enum>
-             </property>
-             <property name="toolTip">
-              <string>Delete selected wordlist</string>
-             </property>
-             <property name="accessibleDescription">
-              <string>Delete selected wordlist</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonAddWordList">
-             <property name="focusPolicy">
-              <enum>Qt::TabFocus</enum>
-             </property>
-             <property name="toolTip">
-              <string>Add custom wordlist</string>
-             </property>
-             <property name="accessibleDescription">
-              <string>Add custom wordlist</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="4" column="2" alignment="Qt::AlignLeft">
-          <widget class="QLabel" name="charactersInPassphraseLabel">
+         <item row="0" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordList">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-            <string>character</string>
+            <string>Wordlist:</string>
            </property>
           </widget>
          </item>