diff --git a/demo/Views/FormView.vala b/demo/Views/FormView.vala
index f16968aeb..9ab60e0a0 100644
--- a/demo/Views/FormView.vala
+++ b/demo/Views/FormView.vala
@@ -15,15 +15,16 @@ public class FormView : DemoPage {
             critical (e.message);
         }
 
+        var validated_header = new Granite.HeaderLabel ("Granite.ValidatedEntry") {
+            secondary_text = "Must be at least 8 characters long"
+        };
+
         var validated_entry = new Granite.ValidatedEntry () {
             min_length = 8,
             regex = username_regex
         };
 
-        var validated_header = new Granite.HeaderLabel ("Granite.ValidatedEntry") {
-            mnemonic_widget = validated_entry,
-            secondary_text = "Must be at least 8 characters long"
-        };
+        var button = new Gtk.Button.with_label ("Submit");
 
         var success_entry = new Gtk.Entry () {
             placeholder_text = "Granite.CssClass.SUCCESS",
@@ -43,7 +44,9 @@ public class FormView : DemoPage {
         };
         error_entry.add_css_class (Granite.CssClass.ERROR);
 
-        var button = new Gtk.Button.with_label ("Submit");
+        var password_entry = new Gtk.PasswordEntry () {
+            show_peek_icon = true
+        };
 
         var datepicker = new Granite.DatePicker ();
         var timepicker = new Granite.TimePicker ();
@@ -79,6 +82,8 @@ public class FormView : DemoPage {
         box.append (success_entry);
         box.append (warning_entry);
         box.append (error_entry);
+        box.append (new Granite.HeaderLabel ("Gtk.PasswordEntry"));
+        box.append (password_entry);
         box.append (new Granite.HeaderLabel ("Date & Time"));
         box.append (datetime_grid);
         box.append (new Granite.HeaderLabel ("Gtk.SpinButton"));
diff --git a/lib/Icons/icons.gresource.xml b/lib/Icons/icons.gresource.xml
index 2dfbd2a30..13a6e6121 100644
--- a/lib/Icons/icons.gresource.xml
+++ b/lib/Icons/icons.gresource.xml
@@ -100,8 +100,10 @@
     <!--Gtk.DropDown-->
     <file compressed="true" preprocess="xml-stripblanks">object-select-symbolic.svg</file>
 
-    <file compressed="true" preprocess="xml-stripblanks">eye-not-looking-symbolic.svg</file>
-    <file compressed="true" preprocess="xml-stripblanks">eye-open-negative-filled-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">view-conceal-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">view-reveal-symbolic.svg</file>
+    <file alias="eye-not-looking-symbolic.svg" compressed="true" preprocess="xml-stripblanks">view-conceal-symbolic.svg</file>
+    <file alias="eye-open-negative-filled-symbolic.svg" compressed="true" preprocess="xml-stripblanks">view-reveal-symbolic.svg</file>
 
     <file compressed="true" preprocess="xml-stripblanks">list-drag-handle-symbolic.svg</file>
 
diff --git a/lib/Icons/scalable/ui/eye-not-looking-symbolic.svg b/lib/Icons/scalable/ui/eye-not-looking-symbolic.svg
deleted file mode 100644
index 943b528c4..000000000
--- a/lib/Icons/scalable/ui/eye-not-looking-symbolic.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg8"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs12" />
-  <path
-     id="rect1405-1"
-     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;opacity:0.5;stop-opacity:1"
-     d="M 8 2 C 6.0787207 2 4.3215777 2.6786075 2.9453125 3.640625 L 4.8574219 5.5527344 A 3.9999998 3.9999998 0 0 1 8 4 A 3.9999998 3.9999998 0 0 1 12 8 A 3.9999998 3.9999998 0 0 1 10.458984 11.154297 L 12.197266 12.892578 C 14.481725 11.637972 16 9.5649546 16 8 C 16 5.6 12.432 2 8 2 z M 1.9667969 4.4277344 C 0.74202545 5.5651659 -5.3935644e-16 6.9069295 0 8 C 0 10.399999 3.5680001 14 8 14 C 9.0579889 14 10.065546 13.794217 10.988281 13.449219 L 9.3144531 11.775391 A 3.9999998 3.9999998 0 0 1 8 12 A 3.9999998 3.9999998 0 0 1 4 8 A 3.9999998 3.9999998 0 0 1 4.2363281 6.6972656 L 1.9667969 4.4277344 z M 8 6 A 2 2 0 0 0 6.2832031 6.9785156 L 9.0214844 9.7167969 A 2 2 0 0 0 10 8 A 2 2 0 0 0 8 6 z M 6.0761719 8.5371094 A 2 2 0 0 0 7.4628906 9.9238281 L 6.0761719 8.5371094 z " />
-  <rect
-     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
-     id="rect2480"
-     width="1.248"
-     height="19.799999"
-     x="-0.62576789"
-     y="1.4161836"
-     rx="0.5"
-     ry="0.5"
-     transform="rotate(-45)" />
-</svg>
diff --git a/lib/Icons/scalable/ui/eye-open-negative-filled-symbolic.svg b/lib/Icons/scalable/ui/eye-open-negative-filled-symbolic.svg
deleted file mode 100644
index 93fb3c3eb..000000000
--- a/lib/Icons/scalable/ui/eye-open-negative-filled-symbolic.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg8"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs12" />
-  <path
-     id="rect1405-1-3"
-     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
-     d="M 8,2 C 3.5680001,2 0,5.6 0,8 c 0,2.399999 3.5680001,6 8,6 4.432,0 8,-3.600001 8,-6 C 16,5.6 12.432,2 8,2 Z M 8,4 A 3.9999998,3.9999998 0 0 1 12,8 3.9999998,3.9999998 0 0 1 8,12 3.9999998,3.9999998 0 0 1 4,8 3.9999998,3.9999998 0 0 1 8,4 Z M 8,6 A 2,2 0 0 0 6,8 2,2 0 0 0 8,10 2,2 0 0 0 10,8 2,2 0 0 0 8,6 Z" />
-</svg>
diff --git a/lib/Icons/scalable/ui/view-conceal-symbolic.svg b/lib/Icons/scalable/ui/view-conceal-symbolic.svg
new file mode 100644
index 000000000..5ff2cbcd3
--- /dev/null
+++ b/lib/Icons/scalable/ui/view-conceal-symbolic.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <path
+     id="rect1405-1-3"
+     style="font-variation-settings:normal;opacity:0.5;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 8 2 C 6.0821358 2 4.326348 2.6735194 2.9511719 3.6328125 L 3.6660156 4.3496094 L 3.6679688 4.3496094 C 4.8534619 3.5619811 6.2635716 3.0890565 7.6640625 3.0078125 C 9.3506502 2.9312143 11.040262 3.461105 12.421875 4.421875 C 13.629983 5.3076894 14.949933 6.5384981 14.992188 8.1386719 C 14.642335 9.9790739 13.044432 11.298509 11.466797 12.148438 L 12.207031 12.890625 C 14.486548 11.635524 16 9.562929 16 8 C 16 5.6 12.432 2 8 2 z M 1.9726562 4.4199219 C 0.74319048 5.5589066 0 6.9045925 0 8 C 0 10.399999 3.5680001 14 8 14 C 9.0615791 14 10.072767 13.794386 10.998047 13.447266 L 10.222656 12.669922 C 7.6939544 13.448512 4.7877383 12.781095 2.8222656 10.990234 C 1.8458886 10.082992 0.66022553 8.7714118 1.1230469 7.3300781 C 1.480647 6.4882052 2.0194251 5.7486197 2.6796875 5.1289062 L 1.9726562 4.4199219 z M 8 5 A 2.9999999 2.9999999 0 0 0 5.5644531 6.2480469 L 6.2871094 6.96875 A 2 2 0 0 1 8 6 A 2 2 0 0 1 10 8 A 2 2 0 0 1 9.03125 9.7128906 L 9.7519531 10.435547 A 2.9999999 2.9999999 0 0 0 11 8 A 2.9999999 2.9999999 0 0 0 8 5 z M 5.0429688 7.4902344 A 2.9999999 2.9999999 0 0 0 5 8 A 2.9999999 2.9999999 0 0 0 8 11 A 2.9999999 2.9999999 0 0 0 8.5097656 10.957031 L 7.484375 9.9316406 A 2 2 0 0 1 6.0683594 8.515625 L 5.0429688 7.4902344 z " />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480"
+     width="1.248"
+     height="19.799999"
+     x="-0.62576789"
+     y="1.4161836"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000"
+     id="rect2480-5"
+     width="1.248"
+     height="19.799999"
+     x="-0.62576789"
+     y="1.4161836"
+     rx="0.5"
+     ry="0.5"
+     transform="rotate(-45)" />
+</svg>
diff --git a/lib/Icons/scalable/ui/view-reveal-symbolic.svg b/lib/Icons/scalable/ui/view-reveal-symbolic.svg
new file mode 100644
index 000000000..ffd3c2708
--- /dev/null
+++ b/lib/Icons/scalable/ui/view-reveal-symbolic.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <path
+     id="rect1405-1-3"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:0.992;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 8 2 C 3.5680001 2 0 5.6 0 8 C 0 10.399999 3.5680001 14 8 14 C 12.432 14 16 10.399999 16 8 C 16 5.6 12.432 2 8 2 z M 7.6640625 3.0078125 C 9.3506502 2.9312143 11.040262 3.461105 12.421875 4.421875 C 13.629983 5.3076894 14.949934 6.5384981 14.992188 8.1386719 C 14.637486 10.004587 12.999057 11.335073 11.400391 12.183594 C 8.6460959 13.632251 5.101991 13.067429 2.8222656 10.990234 C 1.8458886 10.082992 0.66022555 8.7714118 1.1230469 7.3300781 C 2.2048258 4.7833215 4.9530782 3.1650797 7.6640625 3.0078125 z M 8 5 A 2.9999999 2.9999999 0 0 0 5 8 A 2.9999999 2.9999999 0 0 0 8 11 A 2.9999999 2.9999999 0 0 0 11 8 A 2.9999999 2.9999999 0 0 0 8 5 z M 8 6 A 2 2 0 0 1 10 8 A 2 2 0 0 1 8 10 A 2 2 0 0 1 6 8 A 2 2 0 0 1 8 6 z " />
+</svg>