diff --git a/client/css/style.css b/client/css/style.css
index c07500d1..92732caa 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1713,6 +1713,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 
 .password-container .reveal-password i::before {
 	content: "\f06e"; /* https://fontawesome.com/icons/eye?style=solid */
+	transition: color 0.2s;
 }
 
 .password-container .reveal-password.visible i::before {
diff --git a/client/js/socket-events/auth.js b/client/js/socket-events/auth.js
index 1ffbfab0..f89077dd 100644
--- a/client/js/socket-events/auth.js
+++ b/client/js/socket-events/auth.js
@@ -23,7 +23,7 @@ socket.on("auth", function(data) {
 
 		login.html(templates.windows.sign_in());
 
-		utils.togglePasswordField(".reveal-password");
+		utils.togglePasswordField("#sign-in .reveal-password");
 
 		login.find("form").on("submit", function() {
 			const form = $(this);
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 04b8ba88..4ff44dd3 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -30,7 +30,7 @@ socket.on("configuration", function(data) {
 		pop.play();
 	});
 
-	utils.togglePasswordField(".reveal-password");
+	utils.togglePasswordField("#change-password .reveal-password");
 
 	options.initialize();
 	webpush.initialize();
@@ -87,6 +87,6 @@ socket.on("configuration", function(data) {
 				$(this).data("lastvalue", nick);
 			});
 
-		utils.togglePasswordField(".reveal-password");
+		utils.togglePasswordField("#connect .reveal-password");
 	});
 });
diff --git a/client/js/socket-events/network.js b/client/js/socket-events/network.js
index 78c1633f..9cf07d67 100644
--- a/client/js/socket-events/network.js
+++ b/client/js/socket-events/network.js
@@ -43,5 +43,5 @@ socket.on("network:info", function(data) {
 				.click();
 		});
 
-	utils.togglePasswordField(".reveal-password");
+	utils.togglePasswordField("#connect .reveal-password");
 });
diff --git a/client/views/windows/connect.tpl b/client/views/windows/connect.tpl
index 8eeedbc9..0b84d374 100644
--- a/client/views/windows/connect.tpl
+++ b/client/views/windows/connect.tpl
@@ -80,7 +80,7 @@
 		</div>
 		<div class="col-sm-9 password-container">
 			<input class="input" id="connect:password" type="password" name="password" value="{{defaults.password}}">
-			<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show Password" data-alt-label="Hide Password">
+			<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show password" data-alt-label="Hide password">
 				<i></i>
 			</span>
 		</div>
diff --git a/client/views/windows/settings.tpl b/client/views/windows/settings.tpl
index 5c025048..6547f09c 100644
--- a/client/views/windows/settings.tpl
+++ b/client/views/windows/settings.tpl
@@ -190,21 +190,21 @@
 				<div class="col-sm-12 password-container">
 					<label for="old_password_input" class="sr-only">Enter current password</label>
 					<input type="password" id="old_password_input" name="old_password" class="input" placeholder="Enter current password">
-					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show Password" data-alt-label="Hide Password">
+					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show password" data-alt-label="Hide password">
 						<i></i>
 					</span>
 				</div>
 				<div class="col-sm-12 password-container">
 					<label for="new_password_input" class="sr-only">Enter desired new password</label>
 					<input type="password" id="new_password_input" name="new_password" class="input" placeholder="Enter desired new password">
-					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show Password" data-alt-label="Hide Password">
+					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show password" data-alt-label="Hide password">
 						<i></i>
 					</span>
 				</div>
 				<div class="col-sm-12 password-container">
 					<label for="verify_password_input" class="sr-only">Repeat new password</label>
 					<input type="password" id="verify_password_input" name="verify_password" class="input" placeholder="Repeat new password">
-					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show Password" data-alt-label="Hide Password">
+					<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show password" data-alt-label="Hide password">
 						<i></i>
 					</span>
 				</div>
diff --git a/client/views/windows/sign_in.tpl b/client/views/windows/sign_in.tpl
index 17e30981..efc0a291 100644
--- a/client/views/windows/sign_in.tpl
+++ b/client/views/windows/sign_in.tpl
@@ -8,7 +8,7 @@
 	<div class="password-container">
 		<label>Password</label>
 		<input class="input" type="password" name="password">
-		<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show Password" data-alt-label="Hide Password">
+		<span class="reveal-password tooltipped tooltipped-n tooltipped-no-delay" aria-label="Show password" data-alt-label="Hide password">
 			<i></i>
 		</span>
 	</div>