diff --git a/src/js/utils.js b/src/js/utils.js
index 22ecb2183..3571a7600 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -1,6 +1,9 @@
 /* This file contains helpers which should not be part of client.js */
 
 angular.module('Application').directive('passwordReveal', function () {
+    var svgEye = '<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="eye" class="svg-inline--fa fa-eye fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M572.52 241.4C518.29 135.59 410.93 64 288 64S57.68 135.64 3.48 241.41a32.35 32.35 0 0 0 0 29.19C57.71 376.41 165.07 448 288 448s230.32-71.64 284.52-177.41a32.35 32.35 0 0 0 0-29.19zM288 400a144 144 0 1 1 144-144 143.93 143.93 0 0 1-144 144zm0-240a95.31 95.31 0 0 0-25.31 3.79 47.85 47.85 0 0 1-66.9 66.9A95.78 95.78 0 1 0 288 160z"></path></svg>';
+    var svgEyeSlash = '<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="eye-slash" class="svg-inline--fa fa-eye-slash fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M320 400c-75.85 0-137.25-58.71-142.9-133.11L72.2 185.82c-13.79 17.3-26.48 35.59-36.72 55.59a32.35 32.35 0 0 0 0 29.19C89.71 376.41 197.07 448 320 448c26.91 0 52.87-4 77.89-10.46L346 397.39a144.13 144.13 0 0 1-26 2.61zm313.82 58.1l-110.55-85.44a331.25 331.25 0 0 0 81.25-102.07 32.35 32.35 0 0 0 0-29.19C550.29 135.59 442.93 64 320 64a308.15 308.15 0 0 0-147.32 37.7L45.46 3.37A16 16 0 0 0 23 6.18L3.37 31.45A16 16 0 0 0 6.18 53.9l588.36 454.73a16 16 0 0 0 22.46-2.81l19.64-25.27a16 16 0 0 0-2.82-22.45zm-183.72-142l-39.3-30.38A94.75 94.75 0 0 0 416 256a94.76 94.76 0 0 0-121.31-92.21A47.65 47.65 0 0 1 304 192a46.64 46.64 0 0 1-1.54 10l-73.61-56.89A142.31 142.31 0 0 1 320 112a143.92 143.92 0 0 1 144 144c0 21.63-5.29 41.79-13.9 60.11z"></path></svg>';
+
     return {
         link: function (scope, elements) {
             var element = elements[0];
@@ -11,27 +14,25 @@ angular.module('Application').directive('passwordReveal', function () {
             }
 
             var eye = document.createElement('i');
-            eye.classList.add('fa');
-            eye.classList.add('fa-eye-slash');
+            eye.innerHTML = svgEyeSlash;
+            eye.style.width = '18px';
+            eye.style.height = '18px';
             eye.style.position = 'relative';
             eye.style.float = 'right';
-            eye.style.marginTop = '-23px';
+            eye.style.marginTop = '-24px';
             eye.style.marginRight = '10px';
             eye.style.cursor = 'pointer';
 
             eye.addEventListener('click', function () {
                 if (element.type === 'password') {
                     element.type = 'text';
-                    eye.classList.remove('fa-eye-slash');
-                    eye.classList.add('fa-eye');
+                    eye.innerHTML = svgEye;
                 } else {
                     element.type = 'password';
-                    eye.classList.remove('fa-eye');
-                    eye.classList.add('fa-eye-slash');
+                    eye.innerHTML = svgEyeSlash;
                 }
             });
 
-
             element.parentNode.style.position = 'relative';
             element.parentNode.insertBefore(eye, element.nextSibling);
         }
diff --git a/src/templates/proxyauth-login.ejs b/src/templates/proxyauth-login.ejs
index 302bf7e28..e11a33f21 100644
--- a/src/templates/proxyauth-login.ejs
+++ b/src/templates/proxyauth-login.ejs
@@ -251,28 +251,31 @@
       // patch up for password reveal see dashboard/js/utils.js
       var element = document.getElementById('inputPassword');
 
+      var svgEye = '<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="eye" class="svg-inline--fa fa-eye fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M572.52 241.4C518.29 135.59 410.93 64 288 64S57.68 135.64 3.48 241.41a32.35 32.35 0 0 0 0 29.19C57.71 376.41 165.07 448 288 448s230.32-71.64 284.52-177.41a32.35 32.35 0 0 0 0-29.19zM288 400a144 144 0 1 1 144-144 143.93 143.93 0 0 1-144 144zm0-240a95.31 95.31 0 0 0-25.31 3.79 47.85 47.85 0 0 1-66.9 66.9A95.78 95.78 0 1 0 288 160z"></path></svg>';
+      var svgEyeSlash = '<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="eye-slash" class="svg-inline--fa fa-eye-slash fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M320 400c-75.85 0-137.25-58.71-142.9-133.11L72.2 185.82c-13.79 17.3-26.48 35.59-36.72 55.59a32.35 32.35 0 0 0 0 29.19C89.71 376.41 197.07 448 320 448c26.91 0 52.87-4 77.89-10.46L346 397.39a144.13 144.13 0 0 1-26 2.61zm313.82 58.1l-110.55-85.44a331.25 331.25 0 0 0 81.25-102.07 32.35 32.35 0 0 0 0-29.19C550.29 135.59 442.93 64 320 64a308.15 308.15 0 0 0-147.32 37.7L45.46 3.37A16 16 0 0 0 23 6.18L3.37 31.45A16 16 0 0 0 6.18 53.9l588.36 454.73a16 16 0 0 0 22.46-2.81l19.64-25.27a16 16 0 0 0-2.82-22.45zm-183.72-142l-39.3-30.38A94.75 94.75 0 0 0 416 256a94.76 94.76 0 0 0-121.31-92.21A47.65 47.65 0 0 1 304 192a46.64 46.64 0 0 1-1.54 10l-73.61-56.89A142.31 142.31 0 0 1 320 112a143.92 143.92 0 0 1 144 144c0 21.63-5.29 41.79-13.9 60.11z"></path></svg>';
+
       var eye = document.createElement('i');
-      eye.classList.add('fa');
-      eye.classList.add('fa-eye-slash');
-      eye.style.position = 'absolute';
-      eye.style.right = '10px';
-      eye.style.bottom = '10px';
+      eye.innerHTML = svgEyeSlash;
+      eye.style.width = '18px';
+      eye.style.height = '18px';
+      eye.style.position = 'relative';
+      eye.style.float = 'right';
+      eye.style.marginTop = '-24px';
+      eye.style.marginRight = '10px';
       eye.style.cursor = 'pointer';
 
       eye.addEventListener('click', function () {
           if (element.type === 'password') {
               element.type = 'text';
-              eye.classList.remove('fa-eye-slash');
-              eye.classList.add('fa-eye');
+              eye.innerHTML = svgEye;
           } else {
               element.type = 'password';
-              eye.classList.remove('fa-eye');
-              eye.classList.add('fa-eye-slash');
+              eye.innerHTML = svgEyeSlash;
           }
       });
 
       element.parentNode.style.position = 'relative';
-      element.parentNode.append(eye);
+      element.parentNode.insertBefore(eye, element.nextSibling);
 
   </script>