diff --git a/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg b/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
new file mode 100644
index 000000000..a7167699f
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16px"
+   viewBox="0 0 16 16"
+   width="16px"
+   version="1.1"
+   id="svg867"
+   sodipodi:docname="cinnamon-screensaver-view-conceal.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs871" />
+  <sodipodi:namedview
+     id="namedview869"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="52.375"
+     inkscape:cx="6.4725537"
+     inkscape:cy="8"
+     inkscape:window-width="1920"
+     inkscape:window-height="980"
+     inkscape:window-x="1920"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg867" />
+  <path
+     d="m 1.53125 0.46875 l -1.0625 1.0625 l 14 14 l 1.0625 -1.0625 l -2.382812 -2.382812 c 1.265624 -1.0625 2.171874 -2.496094 2.589843 -4.097657 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 c -1.367188 0.011719 -2.707031 0.371094 -3.894531 1.042969 z m 6.46875 3.53125 c 2.210938 0 4 1.789062 4 4 c -0.003906 0.800781 -0.246094 1.578125 -0.699219 2.238281 l -1.46875 -1.46875 c 0.105469 -0.242187 0.164063 -0.503906 0.167969 -0.769531 c 0 -1.105469 -0.894531 -2 -2 -2 c -0.265625 0.003906 -0.527344 0.0625 -0.769531 0.167969 l -1.46875 -1.46875 c 0.660156 -0.453125 1.4375 -0.695313 2.238281 -0.699219 z m -6.144531 0.917969 c -0.753907 0.898437 -1.296875 1.957031 -1.59375 3.09375 c 0.914062 3.523437 4.097656 5.984375 7.738281 5.988281 c 0.855469 -0.007812 1.703125 -0.152344 2.511719 -0.425781 l -1.667969 -1.667969 c -0.277344 0.058594 -0.5625 0.089844 -0.84375 0.09375 c -2.210938 0 -4 -1.789062 -4 -4 c 0.003906 -0.28125 0.035156 -0.566406 0.09375 -0.84375 z m 0 0"
+     fill="#2e3436"
+     id="path865"
+     style="stroke:none;fill:#ffffff;fill-opacity:0.69999999" />
+</svg>
diff --git a/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg b/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
new file mode 100644
index 000000000..8e8f9db9c
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16px"
+   viewBox="0 0 16 16"
+   width="16px"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="cinnamon-screensaver-view-reveal.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.3372549"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="52.375"
+     inkscape:cx="6.4725537"
+     inkscape:cy="8"
+     inkscape:window-width="1920"
+     inkscape:window-height="980"
+     inkscape:window-x="1920"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 8 2 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.007812 c 0.914062 3.527344 4.097656 5.988282 7.738281 5.992188 c 3.648438 -0.003906 6.832031 -2.476562 7.738281 -6.011719 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 z m 0 2 c 2.210938 0 4 1.789062 4 4 s -1.789062 4 -4 4 s -4 -1.789062 -4 -4 s 1.789062 -4 4 -4 z m 0 2 c -1.105469 0 -2 0.894531 -2 2 s 0.894531 2 2 2 s 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 0"
+     fill="#2e3436"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.69999999;stroke:none" />
+</svg>
diff --git a/src/passwordEntry.py b/src/passwordEntry.py
index 96fe004a3..42c15f4a8 100644
--- a/src/passwordEntry.py
+++ b/src/passwordEntry.py
@@ -29,6 +29,9 @@ def __init__(self):
         self.set_placeholder_text (placeholder_text)
         self.set_can_default(True)
 
+        self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-reveal")
+        trackers.con_tracker_get().connect(self, "icon-press", self.on_icon_pressed)
+
         self.placeholder_text = placeholder_text
         self.current_icon_name = None
         self.current_flag_id = 0
@@ -174,6 +177,16 @@ def on_config_changed(self, controller):
     def on_icon_pressed(self, entry, icon_pos, event):
         if icon_pos == Gtk.EntryIconPosition.PRIMARY:
             self.keyboard_controller.next_group()
+        elif icon_pos == Gtk.EntryIconPosition.SECONDARY:
+            if self.get_input_purpose() == Gtk.InputPurpose.FREE_FORM:
+                self.set_visibility(False)
+                self.set_input_purpose(Gtk.InputPurpose.PASSWORD)
+                self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-reveal")
+            else:
+                self.set_visibility(True)
+                self.set_input_purpose(Gtk.InputPurpose.FREE_FORM)
+                self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "cinnamon-screensaver-view-conceal")
+            self.queue_draw()
 
     def update_layout_icon(self):
         """
@@ -222,10 +235,6 @@ def set_lockscreen_keyboard_layout(self):
         self.update_saved_group(new_group)
         self.update_layout_icon()
 
-        trackers.con_tracker_get().connect(self,
-                                           "icon-press",
-                                           self.on_icon_pressed)
-
         trackers.con_tracker_get().connect(self,
                                            "draw",
                                            self.on_draw)