diff --git a/src/components/AclStateButton.vue b/src/components/AclStateButton.vue
index 60d38e95d..43438b6be 100644
--- a/src/components/AclStateButton.vue
+++ b/src/components/AclStateButton.vue
@@ -27,8 +27,8 @@
 	<div v-else style="position: relative;" v-click-outside="popoverClose">
 		<button :disabled="disabled" @click="open = true" v-if="state === STATES.INHERIT_DENY" class="icon-deny inherited" v-tooltip="t('groupfolders', 'Denied (Inherited permission)')"></button>
 		<button :disabled="disabled" @click="open = true" v-else-if="state === STATES.INHERIT_ALLOW" class="icon-checkmark inherited" v-tooltip="t('groupfolders', 'Allowed (Inherited permission)')"></button>
-		<button :disabled="disabled" @click="open = true" v-else-if="state === STATES.SELF_DENY" class="icon-deny" v-tooltip="t('groupfolders', 'Denied')"></button>
-		<button :disabled="disabled" @click="open = true" v-else-if="state === STATES.SELF_ALLOW" class="icon-checkmark" v-tooltip="t('groupfolders', 'Allowed')"></button>
+		<button :disabled="disabled" @click="open = true" v-else-if="state === STATES.SELF_DENY" v-bind:class="'icon-deny' + (inherited ? ' inherited' : '')" v-tooltip="t('groupfolders', 'Denied')"></button>
+		<button :disabled="disabled" @click="open = true" v-else-if="state === STATES.SELF_ALLOW" v-bind:class="'icon-checkmark' + (inherited ? ' inherited' : '')" v-tooltip="t('groupfolders', 'Allowed')"></button>
 		<div class="popovermenu" :class="{open: open}"><PopoverMenu :menu="menu"></PopoverMenu></div>
 	</div>
 </template>
@@ -47,6 +47,10 @@
 		name: 'AclStateButton',
 		components: {PopoverMenu},
 		props: {
+			inherited: {
+				type: Boolean,
+				default: false
+			},
 			state: {
 				type: Number,
 				default: STATES.INHERIT_DENY
diff --git a/src/components/SharingSidebarView.vue b/src/components/SharingSidebarView.vue
index 6555e8533..8ab06d5db 100644
--- a/src/components/SharingSidebarView.vue
+++ b/src/components/SharingSidebarView.vue
@@ -72,22 +72,27 @@
 				</td>
 				<td class="state-column">
 					<AclStateButton :state="getState(OC.PERMISSION_READ, item.permissions, item.mask)"
+									:inherited="item.inherited"
 									@update="changePermission(item, OC.PERMISSION_READ, $event)" :disabled="loading"/>
 				</td>
 				<td class="state-column">
 					<AclStateButton :state="getState(OC.PERMISSION_UPDATE, item.permissions, item.mask)"
+									:inherited="item.inherited"
 									@update="changePermission(item, OC.PERMISSION_UPDATE, $event)" :disabled="loading"/>
 				</td>
 				<td class="state-column" v-if="model.type === 'dir'">
 					<AclStateButton :state="getState(OC.PERMISSION_CREATE, item.permissions, item.mask)"
+									:inherited="item.inherited"
 									@update="changePermission(item, OC.PERMISSION_CREATE, $event)" :disabled="loading"/>
 				</td>
 				<td class="state-column">
 					<AclStateButton :state="getState(OC.PERMISSION_DELETE, item.permissions, item.mask)"
+									:inherited="item.inherited"
 									@update="changePermission(item, OC.PERMISSION_DELETE, $event)" :disabled="loading"/>
 				</td>
 				<td class="state-column">
 					<AclStateButton :state="getState(OC.PERMISSION_SHARE, item.permissions, item.mask)"
+									:inherited="item.inherited"
 									@update="changePermission(item, OC.PERMISSION_SHARE, $event)" :disabled="loading"/>
 				</td>
 				<td class="state-column"><a v-if="item.inherited === false" class="icon-close" v-tooltip="t('groupfolders', 'Remove access rule')"