diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
index 12822b3f..38e7a7b9 100644
--- a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
@@ -50,46 +50,35 @@ public class pwgenDialogFragment extends DialogFragment {
         checkBox.setChecked(!prefs.getBoolean("B", false));
 
         checkBox = (CheckBox) view.findViewById(R.id.pronounceable);
-        checkBox.setChecked(!prefs.getBoolean("s", false));
+        checkBox.setChecked(!prefs.getBoolean("s", true));
 
         TextView textView = (TextView) view.findViewById(R.id.lengthNumber);
-        textView.setText(Integer.toString(prefs.getInt("length", 8)));
+        textView.setText(Integer.toString(prefs.getInt("length", 20)));
 
         textView = (TextView) view.findViewById(R.id.passwordText);
         textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
 
-        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                TextView edit = (TextView) getActivity().findViewById(R.id.crypto_password_edit);
-                TextView generate = (TextView) getDialog().findViewById(R.id.passwordText);
-                edit.append(generate.getText());
-            }
+        builder.setPositiveButton(getResources().getString(R.string.dialog_ok), (dialog, which) -> {
+            setPreferences();
+            TextView edit = (TextView) getActivity().findViewById(R.id.crypto_password_edit);
+            TextView generate = (TextView) getDialog().findViewById(R.id.passwordText);
+            edit.append(generate.getText());
         });
 
-        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
+        builder.setNegativeButton(getResources().getString(R.string.dialog_cancel), (dialog, which) -> {
 
-            }
         });
 
-        builder.setNeutralButton("Generate", null);
+        builder.setNeutralButton(getResources().getString(R.string.pwgen_generate), null);
 
         final AlertDialog ad = builder.setTitle("Generate Password").create();
-        ad.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL);
-                b.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        setPreferences();
-                        TextView textView = (TextView) getDialog().findViewById(R.id.passwordText);
-                        textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
-                    }
-                });
-            }
+        ad.setOnShowListener(dialog -> {
+            Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL);
+            b.setOnClickListener(v -> {
+                setPreferences();
+                TextView textView1 = (TextView) getDialog().findViewById(R.id.passwordText);
+                textView1.setText(pwgen.generate(getActivity().getApplicationContext()).get(0));
+            });
         });
         return ad;
     }
diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml
index 3fd8bd51..072a78a9 100644
--- a/app/src/main/res/layout/fragment_pwgen.xml
+++ b/app/src/main/res/layout/fragment_pwgen.xml
@@ -39,7 +39,7 @@
                     android:id="@+id/include"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Include"
+                    android:text="@string/pwgen_include"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:layout_marginBottom="8dp"/>
 
@@ -47,26 +47,26 @@
                     android:id="@+id/numerals"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Numerals"/>
+                    android:text="@string/pwgen_numerals"/>
 
 
                 <CheckBox
                     android:id="@+id/symbols"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Symbols"/>
+                    android:text="@string/pwgen_symbols"/>
 
                 <CheckBox
                     android:id="@+id/uppercase"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Uppercase"/>
+                    android:text="@string/pwgen_uppercase"/>
 
                 <CheckBox
                     android:id="@+id/ambiguous"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Ambiguous"/>
+                    android:text="@string/pwgen_ambiguous"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8db99ff..a9b03151 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,6 +114,14 @@
     <string name="pref_recursive_filter">Recursive filtering</string>
     <string name="pref_recursive_filter_hint">Recursively find passwords of the current directory.</string>
 
+    <!-- pwgen fragment -->
+    <string name="pwgen_generate">Generate</string>
+    <string name="pwgen_include">Include</string>
+    <string name="pwgen_numerals">Numerals</string>
+    <string name="pwgen_symbols">Symbols</string>
+    <string name="pwgen_uppercase">Uppercase</string>
+    <string name="pwgen_ambiguous">Ambiguous</string>
+
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Yes</string>