diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index f02babda30..4c86f3289b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -179,7 +179,6 @@
 @import "components/users/umb-user-group-preview.less";
 @import "components/users/umb-user-preview.less";
 @import "components/users/umb-user-picker-list.less";
-@import "components/users/umb-permission.less";
 
 
 // Utilities
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
index bfe41ccaac..12d7085b0a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
@@ -31,6 +31,11 @@ a.umb-list-item:focus {
     opacity: 1;
 }
 
+.umb-list-item__description {
+    font-size: 13px;
+    color: @gray-4;
+}
+
 .umb-list-checkbox {
     position: absolute;
     opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
deleted file mode 100644
index 0d74986d65..0000000000
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
+++ /dev/null
@@ -1,33 +0,0 @@
-.umb-permission {
-    display: flex;
-    border-bottom: 1px solid @gray-9;
-    padding: 7px 0;
-}
-
-.umb-permission:last-of-type {
-    border-bottom: none;
-}
-
-.umb-permission__toggle {
-    padding-right: 20px;
-    cursor: pointer;
-}
-
-.umb-permission__content {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    flex: 1 1 auto;
-    cursor: pointer;
-}
-
-.umb-permission--disabled .umb-permission__toggle,
-.umb-permission--disabled .umb-permission__content {
-    cursor: not-allowed;
-    opacity: 0.8;
-}
-
-.umb-permission__description {
-    font-size: 13px;
-    color: @gray-4;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
index 739aab0730..d1ddcdb1dd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
@@ -1,7 +1,7 @@
 <span class="db" ng-repeat="notification in vm.notifications">
     <!-- These are server side notifications for messages, generally success/warning, validation messages handled separately -->
     <!-- Success = 3, Error = 2, Warning = 4 -->
-    <span class="db umb-permission__description"
+    <span class="db umb-list-item__description"
           ng-class="{'text-success': notification.type === 3, 'text-error': notification.type === 2 || notification.type === 4}">
         {{notification.message}}
     </span>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 4ae09049e0..a9afdffda6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -26,14 +26,14 @@
                             <span>{{ variant.language.name }}</span>
                             <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
 
-                            <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                            <span class="db umb-list-item__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.language.isMandatory"> - </span>
                                 <span ng-if="variant.language.isMandatory" ng-class="{'text-error': (variant.language.isMandatory && variant.willPublish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
 
                             <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                <span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
 
                             <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -60,11 +60,11 @@
                 </div>
 
                 <div ng-if="!(variant.notifications && variant.notifications.length > 0)">
-                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                    <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
                 </div>
 
                 <div ng-repeat="notification in variant.notifications">
-                    <div class="umb-permission__description text-success">{{notification.message}}</div>
+                    <div class="umb-list-item__description text-success">{{notification.message}}</div>
                 </div>
 
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
index 2ec74bcf70..2e392e9e4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
@@ -55,13 +55,13 @@
                             <label for="{{variant.htmlId}}" style="margin-bottom: 0;">
                                 <span>{{ variant.language.name }}</span>
 
-                                <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                <span class="db umb-list-item__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                     <umb-variant-state variant="variant"></umb-variant-state>
                                     <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                                 </span>
 
                                 <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                    <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                    <span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                                 </span>
 
                                 <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index 6116867adb..018a1b7add 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -34,11 +34,11 @@
                                 <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
 
                                 <span class="db" ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                                    <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
                                 </span>
 
                                 <span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
-                                    <span class="db umb-permission__description text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
+                                    <span class="db umb-list-item__description text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
                                 </span>
 
                                 <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -68,11 +68,11 @@
                     </div>
 
                     <div ng-if="!(variant.notifications && variant.notifications.length > 0)">
-                        <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                        <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
                     </div>
 
                     <div ng-repeat="notification in variant.notifications">
-                        <div class="umb-permission__description text-success">{{notification.message}}</div>
+                        <div class="umb-list-item__description text-success">{{notification.message}}</div>
                     </div>
                 </div>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index e993cd2cf3..b573acaf52 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -99,7 +99,7 @@
                             <label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
 
-                                <span class="db umb-permission__description"
+                                <span class="db umb-list-item__description"
                                       ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                     <umb-variant-state variant="variant"></umb-variant-state>
                                     <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
@@ -167,7 +167,7 @@
                                    val-server-field="{{variant.htmlId}}" />
 
                             <div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
-                                <div class="umb-permission__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
+                                <div class="umb-list-item__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
                             </div>
 
                             <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
index 6ae777ec83..b1da239b1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
@@ -27,11 +27,11 @@
                             <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
 
                             <span class="db" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                                <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
                             </span>
 
                             <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                <span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
 
                             <umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -56,7 +56,7 @@
                     <span>{{ variant.language.name }}</span>
                     <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
                 </div>
-                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
             </div>
         </div>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
index 5bc69eeb9e..2c6dea3a6f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
@@ -29,7 +29,7 @@
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
 
-                                <span class="db umb-permission__description">
+                                <span class="db umb-list-item__description">
                                     <umb-variant-state variant="variant"></umb-variant-state>
                                     <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                                 </span>
@@ -55,7 +55,7 @@
                     </div>
     
                     <div>
-                        <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                        <umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
                     </div>
                 </div>
             </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/edit.html b/src/Umbraco.Web.UI.Client/src/views/languages/edit.html
index 4c9ef8dc9a..b466433b22 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/edit.html
@@ -34,28 +34,28 @@
                             </span>                            
                         </umb-control-group>
 
-                        <umb-control-group label="@general_settings">
+                        <umb-control-group label="@general_settings" class="umb-toggle-group">
 
-                            <div class="umb-permission" ng-click="vm.toggleDefault()" ng-class="{'umb-permission--disabled': vm.initIsDefault}">
+                            <div class="umb-toggle-group-item" ng-click="vm.toggleDefault()" ng-class="{'umb-toggle-group-item--disabled': vm.initIsDefault}">
                                 <umb-toggle
-                                    class="umb-permission__toggle"
+                                    class="umb-toggle-group-item__toggle"
                                     checked="vm.language.isDefault"
                                     disabled="vm.initIsDefault">
                                 </umb-toggle>
-                                <div class="umb-permission__content" >
+                                <div class="umb-toggle-group-item__content" >
                                     <div>{{vm.labels.defaultLanguage}}</div>
-                                    <div class="umb-permission__description">{{vm.labels.defaultLanguageHelp}}</div>
+                                    <div class="umb-toggle-group-item__description">{{vm.labels.defaultLanguageHelp}}</div>
                                 </div>
                             </div>
 
-                            <div class="umb-permission" ng-click="vm.toggleMandatory()">
+                            <div class="umb-toggle-group-item" ng-click="vm.toggleMandatory()">
                                 <umb-toggle
-                                    class="umb-permission__toggle"
+                                    class="umb-toggle-group-item__toggle"
                                     checked="vm.language.isMandatory">
                                 </umb-toggle>
-                                <div class="umb-permission__content">
+                                <div class="umb-toggle-group-item__content">
                                     <div>{{vm.labels.mandatoryLanguage}}</div>
-                                    <div class="umb-permission__description">{{vm.labels.mandatoryLanguageHelp}}</div>
+                                    <div class="umb-toggle-group-item__description">{{vm.labels.mandatoryLanguageHelp}}</div>
                                 </div>
                             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
index 8354b323fa..ccab8ea97b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
@@ -31,7 +31,7 @@
                                     <span ng-class="{'bold': language.isDefault}">{{ language.name }}</span>
                                 </label>
     
-                                <div class="umb-permission__description">
+                                <div class="umb-list-item__description">
                                     <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
                                 </div>
     
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
index 5cc46c5ce5..7085400f4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
@@ -29,7 +29,7 @@
                                     <span ng-class="{'bold': language.isDefault}">{{ language.name }}</span>
                                 </label>
         
-                                <div class="umb-permission__description">
+                                <div class="umb-list-item__description">
                                     <span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
                                 </div>