diff --git a/js/functions.js b/js/functions.js
index 2e1de549ed..628255fecc 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -157,8 +157,8 @@ function PMA_current_version()
 
 function displayPasswordGenerateButton()
 {
-    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
-    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
+    $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
+    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
 }
 
 /*
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index c1098fce3f..35970cd8e8 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -366,7 +366,7 @@ function PMA_replication_gui_master_addslaveuser()
         . '    ' . __('Generate Password') . ':'
         . '</label>'
         . '<span class="options">'
-        . '    <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
+        . '    <input type="button" class="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
         . '</span>'
         . '<input type="text" name="generated_pw" id="generated_pw" />'
         . '</div>'
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 848c702b22..53a7b2060d 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -198,7 +198,8 @@ input[type=submit] {
 
 input[type=submit],
 input[type=reset],
-input[name=submit_reset] {
+input[name=submit_reset],
+input.button {
     margin-left: 14px;
     border: 1px solid #aaa;
     padding: 3px 7px;
@@ -217,7 +218,8 @@ input[name=submit_reset] {
 
 input[type=submit]:hover,
 input[type=reset]:hover,
-input[name=submit_reset]:hover {
+input[name=submit_reset]:hover,
+input.button:hover {
     position: relative;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?>
     cursor: pointer;
@@ -225,7 +227,8 @@ input[name=submit_reset]:hover {
 
 input[type=submit]:active,
 input[type=reset]:active,
-input[name=submit_reset]:active {
+input[name=submit_reset]:active,
+input.button:active {
     position: relative;
     top: 1px;
     left: 1px;