diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index cb2bb46335..880226e7d1 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -41,17 +41,6 @@
 	padding: 18px 0 18px 36px;
 }
 
-/* fix clickable area because in the share tab popover the label is inside the actual menu item*/
-#shareWithList .popovermenu .shareOption {
-	padding-right: 0 !important;
-}
-/* fix clickable area because in the share tab popover the label is inside the actual menu item*/
-.shareTabView .popovermenu label {
-	width: 100%;
-	display: inline-block;
-	padding: 0 10px 0 0 !important;
-}
-
 .shareTabView label {
 	white-space: nowrap;
 }
@@ -100,11 +89,6 @@
 	opacity: .5;
 }
 
-#shareWithList .shareOption.menuitem > label:before {
-	/* Checkboxes positionning */
-    margin: 0 12px !important;
-}
-
 #shareWithList .unshare {
 	padding: 1px 6px;
 	vertical-align: text-bottom;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 4f17c91764..159982e0bf 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -864,6 +864,12 @@ kbd {
 				width: 16px;
 				padding: 0 10px;
 			}
+			> input.checkbox + label {
+				padding: 0 !important;
+				&::before {
+					margin: -2px 12px 0;
+				}
+			}
 		}
 		[class^='icon-'],
 		[class*=' icon-']{