diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 05033dc2fe..b3652c128b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -446,6 +446,7 @@ table td.filename .uploadtext {
 /* Use label to have bigger clickable size for checkbox */
 #fileList tr td.filename>.selectCheckBox + label,
 .select-all + label {
+	background-position: 30px 30px;
 	height: 50px;
 	position: absolute;
 	width: 50px;
diff --git a/core/css/styles.css b/core/css/styles.css
index 570e5019dc..2d1a4517f0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -167,13 +167,29 @@ input[type="checkbox"] {
 }
 
 input[type="checkbox"] + label {
-		background: url('../img/actions/checkbox.svg') bottom right no-repeat;
-		opacity: 0.5;
+		background: url('../img/actions/checkbox.svg') no-repeat;
+		opacity: 0.7;
+}
+
+input[type="checkbox"] + label.white {
+		background: url('../img/actions/checkbox-white.svg') no-repeat;
 }
 
 input[type="checkbox"]:checked + label {
-	background: url('../img/actions/checkbox-checked.svg') bottom right no-repeat;
-	opacity: 0.5;
+	background: url('../img/actions/checkbox-checked.svg') no-repeat;
+	opacity: 0.7;
+}
+
+input[type="checkbox"]:checked + label.white {
+	background: url('../img/actions/checkbox-checked-white.svg') no-repeat;
+}
+
+input[type="checkbox"] + label,
+input[type="checkbox"] + label.white,
+input[type="checkbox"]:checked + label,
+input[type="checkbox"]:checked + label.white {
+	background-position: left;
+	padding-left: 20px;
 }
 
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
@@ -631,7 +647,6 @@ label.infield {
 	margin: 0;
 	padding: 14px;
 	padding-left: 28px;
-	margin-left: -28px;
 	vertical-align: middle;
 }
 #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
@@ -831,6 +846,7 @@ label.infield {
 	opacity: .7;
 }
 #body-login .remember-login-container {
+	margin-top: 10px;
 	text-align: center;
 }
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 513988876e..69d0b033e9 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -67,7 +67,7 @@ script('core', [
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
 		<div class="remember-login-container">
 			<input type="checkbox" name="remember_login" value="1" id="remember_login">
-			<label for="remember_login"><?php p($l->t('remember')); ?></label>
+			<label for="remember_login" class="white"><?php p($l->t('remember')); ?></label>
 		</div>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>