diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 2102b36414..65ebe08f5b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -335,7 +335,8 @@ input.umb-group-builder__group-title-input:disabled:hover {
 
 .umb-group-builder__group-inherited-label {
   font-size: 13px;
-  display: inline-block;
+  display: inline-flex;
+  align-items: center;
   position: relative;
   top: 2px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html
index b0a1e3373d..3965a7c3ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-tab.html
@@ -12,11 +12,12 @@
 
             <ng-form data-element="tab-icon" name="vm.tabIconForm">
                 <button
-                    type="button" 
+                    type="button"
                     class="btn-reset umb-group-builder__tab-icon"
                     ng-click="vm.openIconPicker()"
                     ng-class="{'-placeholder': !vm.tab.icon }"
-                    title="{{vm.tab.icon}}">
+                    title="{{vm.tab.icon}}"
+                    ng-disabled="vm.sorting">
                         <umb-icon class="icon {{vm.tab.icon}}" icon="{{vm.tab.icon}}" ng-if="vm.tab.icon"></umb-icon>
                         <span class="umb-group-builder__tab-icon-text" ng-if="!vm.tab.icon">
                             <localize key="settings_addIcon">Add icon</localize>