diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
index 43707c7610..55a40cf508 100644
--- a/apps/files_sharing/css/authenticate.css
+++ b/apps/files_sharing/css/authenticate.css
@@ -18,7 +18,3 @@ input[type='submit'] {
 fieldset > p {
 	position: relative;
 }
-
-#password-icon {
-	top: 20px;
-}
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 769b792914..72adf0d167 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -18,7 +18,6 @@
 				placeholder="<?php p($l->t('Password')); ?>" value=""
 				autocomplete="off" autocapitalize="off" autocorrect="off"
 				autofocus />
-			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 			<input type="submit" value=""
 				class="svg icon-confirm input-button-inline" />
 		</p>
diff --git a/core/css/styles.css b/core/css/styles.css
index abefd2748b..1368d8bfa5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -585,30 +585,6 @@ input[type="submit"].enabled {
 	color: #ccc;
 }
 
-/* Icons for username and password fields to better recognize them */
-#adminlogin,
-#adminpass,
-input[name='adminpass-clone'],
-#user,
-#password,
-input[name='password-clone'] {
-	width: 223px !important;
-	padding-left: 36px !important;
-}
-#adminlogin+label+img,
-#adminpass-icon,
-#user+label+img,
-#password-icon {
-	position: absolute;
-	left: 16px;
-	top: 22px;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
-}
-#adminpass-icon, #password-icon {
-	top: 17px;
-}
-
 /* General new input field look */
 #body-login input[type="text"],
 #body-login input[type="password"],
@@ -1204,4 +1180,3 @@ fieldset.warning legend + p, fieldset.update legend + p {
    opacity: 0;
    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
 }
-
diff --git a/core/lostpassword/css/resetpassword.css b/core/lostpassword/css/resetpassword.css
index 29a7e87553..0b3c251e8d 100644
--- a/core/lostpassword/css/resetpassword.css
+++ b/core/lostpassword/css/resetpassword.css
@@ -5,7 +5,3 @@
 .text-center {
 	text-align: center;
 }
-
-#password-icon {
-	top: 20px;
-}
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 9152ae3d75..c17ec65247 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -31,7 +31,6 @@ script('core', 'lostpassword');
 		<p>
 			<label for="password" class="infield"><?php p($l->t('New password')); ?></label>
 			<input type="password" name="password" id="password" value="" placeholder="<?php p($l->t('New Password')); ?>" required />
-			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 		<p class="text-center">
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 716cb1af6a..191acf0b85 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -43,7 +43,6 @@ script('core', [
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required>
 			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
-			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="">
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
@@ -51,7 +50,6 @@ script('core', [
 				value="<?php p($_['adminpass']); ?>"
 				autocomplete="off" autocapitalize="off" autocorrect="off" required>
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
-			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="">
 			<input type="checkbox" id="show" name="show">
 			<label for="show" class="svg"></label>
 			<div class="strengthify-wrapper"></div>
diff --git a/core/templates/login.php b/core/templates/login.php
index b21b6e3d49..03be6258fd 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -45,7 +45,6 @@ script('core', [
 				<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="user" class="infield"><?php p($l->t('Username')); ?></label>
-			<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 		</p>
 
 		<p class="groupbottom">
@@ -54,7 +53,6 @@ script('core', [
 				<?php p($_['user_autofocus'] ? '' : 'autofocus'); ?>
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
-			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 			<input type="submit" id="submit" class="login primary icon-confirm svg" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 		</p>