diff --git a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
index 99bfe4cf4..1b6ad8646 100644
--- a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.form
@@ -46,7 +46,7 @@
                               <Component id="remember_checkbox" min="-2" max="-2" attributes="0"/>
                               <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                           </Group>
-                          <Component id="please_label" alignment="0" max="32767" attributes="0"/>
+                          <Component id="please_label" alignment="0" pref="584" max="32767" attributes="0"/>
                       </Group>
                   </Group>
               </Group>
diff --git a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
index d093c2455..ebb992a48 100644
--- a/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/GetMasterPasswordDialog.java
@@ -161,7 +161,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                             .addGroup(layout.createSequentialGroup()
                                 .addComponent(remember_checkbox)
                                 .addGap(0, 0, Short.MAX_VALUE))
-                            .addComponent(please_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                            .addComponent(please_label, javax.swing.GroupLayout.DEFAULT_SIZE, 584, Short.MAX_VALUE))))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -196,6 +196,8 @@ private void cancel_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN
     private void ok_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ok_buttonActionPerformed
 
         status_label.setText("Verifying your password, please wait...");
+        
+        pack();
 
         final Dialog tthis = this;
 
@@ -213,6 +215,8 @@ public void run() {
                         JOptionPane.showMessageDialog(tthis, "BAD PASSWORD!", "Error", JOptionPane.ERROR_MESSAGE);
 
                         status_label.setText("");
+                        
+                        pack();
 
                         current_pass_textfield.setText("");
 
@@ -232,6 +236,7 @@ public void run() {
                 } catch (HeadlessException | NoSuchAlgorithmException | InvalidKeySpecException ex) {
                     Logger.getLogger(getClass().getName()).log(Level.SEVERE, null, ex);
                 }
+                
             }
         });
 
diff --git a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
index 7d852d3bd..3972938aa 100644
--- a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.form
@@ -121,6 +121,9 @@
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Dialog" size="18" style="1"/>
         </Property>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/images/icons8-cancel-30.png"/>
+        </Property>
         <Property name="text" type="java.lang.String" value="CANCEL"/>
         <Property name="doubleBuffered" type="boolean" value="true"/>
       </Properties>
@@ -133,6 +136,9 @@
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Dialog" size="18" style="1"/>
         </Property>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/images/icons8-ok-30.png"/>
+        </Property>
         <Property name="text" type="java.lang.String" value="OK"/>
         <Property name="doubleBuffered" type="boolean" value="true"/>
       </Properties>
@@ -143,7 +149,7 @@
     <Component class="javax.swing.JLabel" name="lock_label">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/megabasterd/lock_medium.png"/>
+          <Image iconType="3" name="/images/lock_medium.png"/>
         </Property>
         <Property name="doubleBuffered" type="boolean" value="true"/>
       </Properties>
diff --git a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
index 6a77a69a3..e0f0e76be 100644
--- a/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/SetMasterPasswordDialog.java
@@ -104,6 +104,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
         confirm_pass_label.setDoubleBuffered(true);
 
         cancel_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
+        cancel_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-cancel-30.png"))); // NOI18N
         cancel_button.setText("CANCEL");
         cancel_button.setDoubleBuffered(true);
         cancel_button.addActionListener(new java.awt.event.ActionListener() {
@@ -113,6 +114,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
 
         ok_button.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
+        ok_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-ok-30.png"))); // NOI18N
         ok_button.setText("OK");
         ok_button.setDoubleBuffered(true);
         ok_button.addActionListener(new java.awt.event.ActionListener() {
@@ -121,7 +123,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/lock_medium.png"))); // NOI18N
+        lock_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/lock_medium.png"))); // NOI18N
         lock_label.setDoubleBuffered(true);
 
         warning_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N