diff --git a/core/css/styles.css b/core/css/styles.css
index 18c41e93f4172e0ec281489f3fab2c3ed75d20b3..ebb59f08fa1ba64f98bb9df354722f3aae1a5cfd 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -149,13 +149,12 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
-#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img {
+#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password-icon {
 	position:absolute; left:1.25em; top:1.65em;
 	opacity:.3;
 }
-#adminpass+label+img, #password+label+img { top:1.1em; }
+#adminpass+label+img, #password-icon { top:1.1em; }
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
-#pass_image { position: absolute; top: 1.2em; left: 1.4em; opacity: 0.3; }
 
 /* Nicely grouping input field sets */
 .grouptop input {
@@ -188,11 +187,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	position:absolute; right:1em; top:.8em; float:right;
 	display:none;
 }
-#login form input[name="show"] + label {
-	position:absolute !important; height:14px; width:24px; right:1em; top:1.25em; float:right;
+#show + label {
+	position:absolute!important; height:14px; width:24px; right:1em; top:1.25em!important;
 	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; opacity:.3;
 }
-#login form input[name="show"]:checked + label { opacity:.8; }
+#show:checked + label { opacity:.8; }
 
 /* Database selector */
 #login form #selectDbType { text-align:center; }
diff --git a/core/templates/login.php b/core/templates/login.php
index e66d27f6d6935e56170f8e4867d9983d3413bc0b..3be2b039b032aa9b95b52c77f809c5f2ef11b9a9 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -33,7 +33,7 @@
 			<input type="password" name="password" id="password" value="" data-typetoggle="#show"
 				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
 			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-			<img class="svg" id="pass_image" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+			<img class="svg" id="password-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
 			<input type="checkbox" id="show" name="show" />
 			<label for="show"></label>
 		</p>