diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index f274d2458873e..09b4a14f2b001 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -319,7 +319,7 @@ public function getStylesheet() {
 			$responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
 				'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
 				'background-color: %s; background-position: center center; background-size:contain;' .
-				'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
+				'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
 				"}\n",
 				\OC::$WEBROOT,
 				$elementColor
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 4325e1988b2a8..d9d5005e25f51 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -428,7 +428,7 @@ public function testGetStylesheetWithOnlyColor() {
 		$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
 			'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
 			'background-color: %s; background-position: center center; background-size:contain;' .
-			'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
+			'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
 			"}\n",
 			\OC::$WEBROOT,
 			$color
@@ -517,7 +517,7 @@ public function testGetStylesheetWithOnlyColorInvert() {
 		$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
 			'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
 			'background-color: #555555; background-position: center center; background-size:contain;' .
-			'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
+			'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
 			"}\n",
 			\OC::$WEBROOT
 		);
@@ -691,7 +691,7 @@ public function testGetStylesheetWithAllCombined() {
 		$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
 			'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
 			'background-color: %s; background-position: center center; background-size:contain;' .
-			'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
+			'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
 			"}\n",
 			\OC::$WEBROOT,
 			$color
@@ -797,7 +797,7 @@ public function testGetStylesheetWithAllCombinedInverted() {
 		$expectedData .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
 			'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
 			'background-color: #555555; background-position: center center; background-size:contain;' .
-			'width:12px; height:12px; padding:0; margin:2px 6px 6px 9px; border-radius:1px;' .
+			'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
 			"}\n",
 			\OC::$WEBROOT
 		);
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index cc1d6a3b468fb..8bcbd0e563df4 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -31,9 +31,6 @@ ul.multiselectoptions.up {
 ul.multiselectoptions>li {
 	overflow: hidden;
 	white-space: nowrap;
-}
-
-ul.multiselectoptions > li > input[type="checkbox"]+label:before {
 	margin-left: 7px;
 }
 ul.multiselectoptions > li input[type='checkbox']+label {
@@ -106,6 +103,7 @@ ul.multiselectoptions input.new {
 
 ul.multiselectoptions > li.creator {
 	padding: 10px;
+	margin: 0;
 	font-weight: bold;
 }
 ul.multiselectoptions > li.creator > input {