diff --git a/www/common/common-icons.js b/www/common/common-icons.js
index 7c9062108..1d9820daf 100644
--- a/www/common/common-icons.js
+++ b/www/common/common-icons.js
@@ -181,6 +181,7 @@ define([
         "tag": "hash",
         "password-reveal": "eye",
         "password-hide": "eye-closed",
+        "password-change": "rotate-ccw-key",
         "arrow-left": "arrow-left",
         "arrow-up": "arrow-up",
         "code": "code-xml",
diff --git a/www/common/inner/mfa.js b/www/common/inner/mfa.js
index b8380a46d..641c31348 100644
--- a/www/common/inner/mfa.js
+++ b/www/common/inner/mfa.js
@@ -134,7 +134,7 @@ define([
             return;
         }
 
-        var button = h('button.btn.btn-primary', Messages.mfa_setup_button);
+        var button = h('button.btn.btn-primary', [Icons.get('lock'), Messages.mfa_setup_button]);
         var $mfaSetupBtn = $(button);
         var pwInput;
         $content.append(h('div.cp-password-container', [
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index ff6aa1f2a..98fe4f2ef 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -225,7 +225,7 @@
                     }
                     button {
                         svg {
-                            margin: 0 0 0 0.2rem;
+                            margin-right: @variables_icon_margin
                         }
                     }
                 }
diff --git a/www/settings/inner.js b/www/settings/inner.js
index d12e897d9..635dd3fc7 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -638,7 +638,7 @@ define([
                 placeholder: Messages.settings_changePasswordNewConfirm,
                 autocomplete: 'new-password',
             }, true),
-            h('button.btn.btn-primary', Messages.settings_changePasswordButton)
+            h('button.btn.btn-primary', [ Icons.get('password-change'), Messages.settings_changePasswordButton ])
         ]);
 
         $(form).appendTo($div);