diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 936e1af246..979ef01c03 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -51,10 +51,9 @@
 	padding: 0 0 16px;
 }
 
-#shareWithList li {
+#shareWithList > li {
 	padding-top: 5px;
 	padding-bottom: 5px;
-	font-weight: bold;
 	white-space: normal;
 	display: inline-flex;
 	align-items: center;
@@ -70,6 +69,11 @@
 	opacity: .5;
 }
 
+#shareWithList .shareOption.menuitem > label:before {
+	/* Checkboxes positionning */
+    margin: 0 12px !important;
+}
+
 #shareWithList .unshare {
 	padding: 1px 6px;
 	vertical-align: text-bottom;
@@ -78,12 +82,6 @@
 	vertical-align: text-top;
 }
 
-#shareWithList .unshare .icon-delete {
-	padding-right: 4px;
-	background-position-x: 0;
-	display: inline-block;
-}
-
 #shareWithList .sharingOptionsGroup .popovermenu:after {
 	right: 3px;
 }
@@ -100,7 +98,7 @@
 	overflow: hidden;
 	vertical-align: middle;
 }
-#shareWithList li label {
+#shareWithList li .sharingOptionsGroup > .shareOption > label {
 	padding: 6px;
 	margin-right: 8px;
 	vertical-align: text-top;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 17eb2c1f9a..b88032340a 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -635,6 +635,7 @@ em {
 			}
 			> span {
 				cursor: pointer;
+				white-space: nowrap;
 			}
 			> p {
 				width: 150px;
diff --git a/core/css/share.scss b/core/css/share.scss
index 7ce365a145..1dbec68989 100644
--- a/core/css/share.scss
+++ b/core/css/share.scss
@@ -73,7 +73,7 @@
 #shareWithList {
 	list-style-type: none;
 	padding: 8px;
-	li {
+	> li {
 		padding-top: 10px;
 		padding-bottom: 10px;
 		font-weight: bold;
@@ -85,8 +85,8 @@
 		flex-shrink: 0;
 		position: relative;
 		.popovermenu {
-			right: -6px;
-			top: 40px;
+			right: -11px;
+			top: 35px;
 			padding: 3px 6px;
 		}
 	}
@@ -112,9 +112,6 @@
 		vertical-align: middle;
 		flex-grow: 5;
 	}
-	li label {
-		margin-right: 8px;
-	}
 }
 
 a {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 0fe0747dd5..4647dedd72 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -59,7 +59,7 @@
 			'<ul>' +
 				'{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' +
 				'<li>' +
-					'<span class="shareOption">' +
+					'<span class="shareOption menuitem">' +
 						'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
 						'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
 					'</span>' +
@@ -68,7 +68,7 @@
 				'{{#if isFolder}}' +
 					'{{#if createPermissionPossible}}{{#unless isMailShare}}' +
 					'<li>' +
-						'<span class="shareOption">' +
+						'<span class="shareOption menuitem">' +
 							'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
 							'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
 						'</span>' +
@@ -76,7 +76,7 @@
 					'{{/unless}}{{/if}}' +
 					'{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
 					'<li>' +
-						'<span class="shareOption">' +
+						'<span class="shareOption menuitem">' +
 							'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
 							'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
 						'</span>' +
@@ -84,7 +84,7 @@
 					'{{/unless}}{{/if}}' +
 					'{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
 					'<li>' +
-						'<span class="shareOption">' +
+						'<span class="shareOption menuitem">' +
 							'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
 							'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
 						'</span>' +