diff --git a/lib/pages_desktop_specific/create_password/create_password_view.dart b/lib/pages_desktop_specific/create_password/create_password_view.dart
index c29fc3de6..8e752f508 100644
--- a/lib/pages_desktop_specific/create_password/create_password_view.dart
+++ b/lib/pages_desktop_specific/create_password/create_password_view.dart
@@ -203,15 +203,18 @@ class _CreatePasswordViewState extends ConsumerState<CreatePasswordView> {
                                       height: 32,
                                       width: 32,
                                       child: Center(
-                                        child: SvgPicture.asset(
-                                          hidePassword
-                                              ? Assets.svg.eye
-                                              : Assets.svg.eyeSlash,
-                                          color: Theme.of(context)
-                                              .extension<StackColors>()!
-                                              .textDark3,
-                                          width: 24,
-                                          height: 19,
+                                        child: MouseRegion(
+                                          cursor: SystemMouseCursors.click,
+                                          child: SvgPicture.asset(
+                                            hidePassword
+                                                ? Assets.svg.eye
+                                                : Assets.svg.eyeSlash,
+                                            color: Theme.of(context)
+                                                .extension<StackColors>()!
+                                                .textDark3,
+                                            width: 24,
+                                            height: 19,
+                                          ),
                                         ),
                                       ),
                                     ),
@@ -354,22 +357,25 @@ class _CreatePasswordViewState extends ConsumerState<CreatePasswordView> {
                                       height: 32,
                                       width: 32,
                                       child: Center(
-                                        child: SvgPicture.asset(
-                                          fieldsMatch && passwordStrength == 1
-                                              ? Assets.svg.checkCircle
-                                              : hidePassword
-                                                  ? Assets.svg.eye
-                                                  : Assets.svg.eyeSlash,
-                                          color: fieldsMatch &&
-                                                  passwordStrength == 1
-                                              ? Theme.of(context)
-                                                  .extension<StackColors>()!
-                                                  .accentColorGreen
-                                              : Theme.of(context)
-                                                  .extension<StackColors>()!
-                                                  .textDark3,
-                                          width: 24,
-                                          height: 19,
+                                        child: MouseRegion(
+                                          cursor: SystemMouseCursors.click,
+                                          child: SvgPicture.asset(
+                                            fieldsMatch && passwordStrength == 1
+                                                ? Assets.svg.checkCircle
+                                                : hidePassword
+                                                    ? Assets.svg.eye
+                                                    : Assets.svg.eyeSlash,
+                                            color: fieldsMatch &&
+                                                    passwordStrength == 1
+                                                ? Theme.of(context)
+                                                    .extension<StackColors>()!
+                                                    .accentColorGreen
+                                                : Theme.of(context)
+                                                    .extension<StackColors>()!
+                                                    .textDark3,
+                                            width: 24,
+                                            height: 19,
+                                          ),
                                         ),
                                       ),
                                     ),
diff --git a/lib/pages_desktop_specific/desktop_login_view.dart b/lib/pages_desktop_specific/desktop_login_view.dart
index 363c1fb0d..ebd1c334b 100644
--- a/lib/pages_desktop_specific/desktop_login_view.dart
+++ b/lib/pages_desktop_specific/desktop_login_view.dart
@@ -175,15 +175,18 @@ class _DesktopLoginViewState extends ConsumerState<DesktopLoginView> {
                                     hidePassword = !hidePassword;
                                   });
                                 },
-                                child: SvgPicture.asset(
-                                  hidePassword
-                                      ? Assets.svg.eye
-                                      : Assets.svg.eyeSlash,
-                                  color: Theme.of(context)
-                                      .extension<StackColors>()!
-                                      .textDark3,
-                                  width: 24,
-                                  height: 24,
+                                child: MouseRegion(
+                                  cursor: SystemMouseCursors.click,
+                                  child: SvgPicture.asset(
+                                    hidePassword
+                                        ? Assets.svg.eye
+                                        : Assets.svg.eyeSlash,
+                                    color: Theme.of(context)
+                                        .extension<StackColors>()!
+                                        .textDark3,
+                                    width: 24,
+                                    height: 24,
+                                  ),
                                 ),
                               ),
                               const SizedBox(