diff --git a/ncp-web/css/ncp.css b/ncp-web/css/ncp.css
index c5ae5727..3c0a075a 100644
--- a/ncp-web/css/ncp.css
+++ b/ncp-web/css/ncp.css
@@ -1339,4 +1339,10 @@ a#versionlink:hover {
 
 .pwd-btn, .default-btn {
   cursor: pointer;
+  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+  opacity: 0.5;
+}
+.pwd-btn:hover, .default-btn:hover {
+  -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+  opacity: 1;
 }
diff --git a/ncp-web/elements.php b/ncp-web/elements.php
index 52c50844..56446306 100644
--- a/ncp-web/elements.php
+++ b/ncp-web/elements.php
@@ -48,7 +48,7 @@ HTML;
                 size=\"40\">";
 
       if (array_key_exists('default', $param))
-        $ret .= "<img class=\"default-btn\" title=\"restore defaults\" src=\"../img/info.svg\">";
+        $ret .= "&nbsp;<img class=\"default-btn\" title=\"restore defaults\" src=\"../img/defaults.svg\">";
 
       if ($param['type'] == 'directory')
       {
@@ -84,7 +84,7 @@ HTML;
                 id=\"$ncp_app-$param[id]\"
                 value=\"$param[value]\"
               size=\"40\">";
-      $ret .= "<img class=\"pwd-btn\" title=\"show password\" src=\"../img/info.svg\">";
+      $ret .= "&nbsp;<img class=\"pwd-btn\" title=\"show password\" src=\"../img/toggle.svg\">";
       $ret .= "</td>";
     }
 
diff --git a/ncp-web/img/defaults.svg b/ncp-web/img/defaults.svg
new file mode 100644
index 00000000..bb09c568
--- /dev/null
+++ b/ncp-web/img/defaults.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" version="1.1" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m7.9319 2.4252c-3.4324 0-5.6787 2.9953-5.5301 5.8394h-1.8778l3.3924 3.4063 3.5454-3.3664h-1.8657c-0.20594-1.4772 1.0106-2.706 2.3366-2.6868 1.386 0.020855 2.4331 1.0688 2.4331 2.3758 0.07821 1.3851-1.4164 2.9788-3.4463 2.1985 0 1.0688 0.00261 2.2115 0 3.2717 3.641 0.72124 6.6389-2.1811 6.6389-5.431 0-3.0961-2.5374-5.6074-5.6266-5.6074z"/></svg>
diff --git a/ncp-web/img/toggle.svg b/ncp-web/img/toggle.svg
new file mode 100644
index 00000000..1ae9d0c2
--- /dev/null
+++ b/ncp-web/img/toggle.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewbox="0 0 16 16"
+   width="16"
+   height="16"
+   id="svg4"
+   sodipodi:docname="toggle.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="799"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8.127661"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     opacity="0.5"
+     d="M8 3C4.89 3 2.073 4.72 0 7.5 2.073 10.28 4.89 12 8 12c3.11 0 5.927-1.72 8-4.5C13.927 4.72 11.11 3 8 3zm0 1.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zM8 6a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"
+     id="path2"
+     style="fill:#000000;fill-opacity:1;opacity:1" />
+</svg>
diff --git a/ncp-web/js/ncp.js b/ncp-web/js/ncp.js
index 5e85bad3..c6c043ef 100644
--- a/ncp-web/js/ncp.js
+++ b/ncp-web/js/ncp.js
@@ -266,6 +266,7 @@ $(function()
     {
       var input = this.trav('previousSibling', 1);
       input.set('.value', input.get('@default'));
+      input.trigger('change');
     });
 
   // Path fields