diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
index 9d2782f184..594558da51 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-variant-switcher.less
@@ -50,6 +50,10 @@ button.umb-variant-switcher__toggle {
             font-weight: bold;
             background-color: @errorBackground;
             color: @errorText;
+            .show-validation-type-warning & {
+                background-color: @warningBackground;
+                color: @warningText;
+            }
 
             animation-duration: 1.4s;
             animation-iteration-count: infinite;
@@ -233,7 +237,10 @@ button.umb-variant-switcher__toggle {
 
 .umb-variant-switcher__item.--error {
     .umb-variant-switcher__name {
-        color: @red;
+        color: @formErrorText;
+        .show-validation-type-warning & {
+            color: @formWarningText;
+        }
         &::after {
             content: '!';
             position: relative;
@@ -250,6 +257,10 @@ button.umb-variant-switcher__toggle {
             font-weight: bold;
             background-color: @errorBackground;
             color: @errorText;
+            .show-validation-type-warning & {
+                background-color: @warningBackground;
+                color: @warningText;
+            }
             
             animation-duration: 1.4s;
             animation-iteration-count: infinite;
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 d414f30dbf..36e01991df 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
@@ -18,15 +18,18 @@
                 <ng-form name="saveVariantSelectorForm">
                     <div class="umb-variant-selector-entry" ng-class="{'umb-list-item--warning': saveVariantSelectorForm.saveVariantSelector.$invalid}">
 
+                        <input type="hidden" name="saveInvariant" val-server-field="_content_variant_invariant_null_" ng-model="variant.save"></input>
+
                         <umb-checkbox input-id="{{variant.htmlId}}"
                                       name="saveVariantSelector"
                                       model="variant.save"
                                       on-change="vm.changeSelection(variant)"
                                       server-validation-field="{{variant.htmlId}}">
 
+
+
                             <span class="umb-variant-selector-entry__title" ng-if="!(variant.segment && variant.language)">
                                 <span ng-bind="variant.displayName"></span>
-                                <strong ng-if="variant.isMandatory" class="umb-control-required">*</strong>
                             </span>
                             <span class="umb-variant-selector-entry__title" ng-if="variant.segment && variant.language">
                                 <span ng-bind="variant.segment"></span>
@@ -36,11 +39,14 @@
                             <span class="umb-variant-selector-entry__description" ng-if="!saveVariantSelectorForm.saveVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.isMandatory"> - </span>
-                                <span ng-if="variant.isMandatory" ng-class="{'text-error': (variant.publish === false) }"><localize key="general_mandatory"></localize></span>
+                                <span ng-if="variant.isMandatory"><localize key="general_mandatory"></localize></span>
                             </span>
                             <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
                                 <span class="text-warning" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
                             </span>
+                            <span class="umb-variant-selector-entry__description" ng-messages="saveVariantSelectorForm.saveInvariant.$error" show-validation-on-submit>
+                                <span class="text-warning" ng-message="valServerField">{{saveVariantSelectorForm.saveInvariant.errorMsg}}</span>
+                            </span>
 
                         </umb-checkbox>