diff --git a/addons/web/static/src/img/new_key.png b/addons/web/static/src/img/new_key.png
index 9e167c3d54a..ac7c7807bd5 100644
Binary files a/addons/web/static/src/img/new_key.png and b/addons/web/static/src/img/new_key.png differ
diff --git a/addons/web/static/src/img/old_key.png b/addons/web/static/src/img/old_key.png
index 3cbce6e1eb2..b1308b42cc4 100644
Binary files a/addons/web/static/src/img/old_key.png and b/addons/web/static/src/img/old_key.png differ
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 48a95e98f1a..c47e7066726 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -331,6 +331,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         self.$el.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore });
         self.$el.find("form td input[name=old_pwd]").css('background','url(/web/static/src/img/old_key.png) no-repeat 4px');
         self.$el.find("form td input[name=new_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px');
+        self.$el.find("form td input[name=confirm_pwd]").css('background','url(/web/static/src/img/new_key.png) no-repeat 4px');
         self.$el.find("form[name=change_pwd_form]").validate({
             messages: {
                 old_pwd: "Please enter your previous password",
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 536c794c58d..535c100b4c7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -263,7 +263,7 @@
                     </tr>
                     <tr>
                         <td><label for="confirm_pwd">Confirm new master password:</label></td>
-                        <td><input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]" minlength="1" style="padding-left: 22px;"/> </td>
+                        <td class="oe_keyImage_new_pwd"><input type="password" name="confirm_pwd" placeholder=" Password..." class="required" equalTo="input[name=new_pwd]" minlength="1"/> </td>
                     </tr>
                 </table>
             </form>
@@ -295,14 +295,14 @@
                            minlength="1" placeholder=" Password..." autofocus="autofocus"/></td>
             </tr>
             <tr>
-            <td><label for="new_password">New Password:</label></td>
-            <td class="oe_keyImage_new_pwd"><input type="password" name="new_password"
+                <td><label for="new_password">New Password:</label></td>
+                <td class="oe_keyImage_new_pwd"><input type="password" name="new_password"
                        placeholder=" Password..." minlength="1"/></td>
             </tr>
             <tr>
                 <td><label for="confirm_pwd">Confirm Password:</label></td>
-                <td><input type="password" name="confirm_pwd"
-                             minlength="1" style="padding-left: 22px;"/></td>
+                <td class="oe_keyImage_new_pwd"><input type="password" name="confirm_pwd"
+                            placeholder=" Password..." minlength="1" /></td>
             </tr>
             <tr>
                 <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>