diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbvalidatecomponent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valrequirecomponent.directive.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/common/directives/components/umbvalidatecomponent.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/validation/valrequirecomponent.directive.js
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 0f2ae52962..5986f6c91d 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
@@ -410,11 +410,10 @@ input.umb-group-builder__group-sort-value {
   }
 
   textarea.editor-label {
-    border: none;
+    border-color:transparent;
     box-shadow: none;
     width: 100%;
-    box-sizing: border-box;
-    padding: 10px 0 0 0;
+    box-sizing: border-box;    
     margin-bottom: 10px;
     font-size: 16px;
     font-weight: bold;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
index 61d1eae8f6..9fb534e388 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-locked-field.less
@@ -27,9 +27,8 @@
 
 input.umb-locked-field__input {
   background: rgba(255, 255, 255, 0); // if using transparent it will hide the text in safari
-  border: none;
-  font-size: 13px;
-  padding: 0;
+  border-color:transparent;
+  font-size: 13px;  
   margin-bottom: 0;
   color: #ccc;
   transition: color 0.25s;
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 03b8bb4bb0..3b2e949b2d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -436,38 +436,11 @@ input[type="checkbox"][readonly] {
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Warning
-.show-validation.ng-invalid .control-group.warning {
-  .formFieldState(@formWarningText, @formWarningText, @formWarningBackground);
-}
 // Error
 .show-validation.ng-invalid .control-group.error, 
 .show-validation.ng-invalid .umb-panel-header-content-wrapper {
     .formFieldState(@formErrorText, @formErrorText, @formErrorBackground);
 }
-// Success
-.show-validation.ng-invalid .control-group.success {
-  .formFieldState(@formSuccessText, @formSuccessText, @formSuccessBackground);
-}
-// Success
-.show-validation.ng-invalid .control-group.info {
-  .formFieldState(@formInfoText, @formInfoText, @formInfoBackground);
-}
-
-// HTML5 invalid states 
-// Shares styles with the .control-group.error above
-
-.show-validation input:focus:invalid,
-.show-validation textarea:focus:invalid,
-.show-validation select:focus:invalid {
-  color: @formErrorText;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @shadow: 0 0 6px lighten(#ee5f5b, 20%);
-    .box-shadow(@shadow);
-  }
-}
 
 //val-highlight directive styling
 .highlight-error {
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index e1f9170424..bf2d75e888 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -182,12 +182,6 @@
   select.ng-invalid,
   textarea.ng-invalid {
     border-color: @borderColor;
-    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-      .box-shadow(@shadow);
-    }
   }
   // Give a small background color for input-prepend/-append
   .input-prepend .add-on,
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index 062954f9c2..f35cd2c207 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -99,21 +99,13 @@
     color: @red;
 }
 
+.umb-headline-editor-wrapper input.ng-invalid::-moz-placeholder,
+.umb-headline-editor-wrapper input.ng-invalid:-ms-input-placeholder,
 .umb-headline-editor-wrapper input.ng-invalid::-webkit-input-placeholder {
     color: @red;
     line-height: 22px;
 }
 
-.umb-headline-editor-wrapper input.ng-invalid::-moz-placeholder {
-    color: @red;
-    line-height: 22px;
-}
-
-.umb-headline-editor-wrapper input.ng-invalid:-ms-input-placeholder {
-    color: @red;
-    line-height: 22px;
-}
-
 /*
 .umb-panel-header i {
     font-size: 13px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
index 99d4b30ea3..7e861b9024 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
@@ -1,9 +1,7 @@
 <div class="content-type-editor-dialog edit-property-settings" ng-controller="Umbraco.Overlay.PropertySettingsOverlay as vm">
 
-   <div class="umb-control-group clearfix">
-
-      <div class="validation-wrapper">
-         <textarea class="editor-label"
+   <div class="umb-control-group control-group">
+        <textarea class="editor-label"
             name="propertyLabel"
             ng-model="model.property.label"
             placeholder="Enter a name..."
@@ -12,25 +10,24 @@
             umb-auto-resize
             required
             overlay-submit-on-enter>
-         </textarea>
-         <span class="validation-label" val-msg-for="propertyLabel" val-toggle-msg="required"><localize key="required" /></span>
-      </div>
-
-      <umb-generate-alias enable-lock="true" alias-from="model.property.label" alias="model.property.alias"></umb-generate-alias>
-
+        </textarea>
    </div>
 
-   <div class="umb-control-group clearfix">
+    <div class="umb-control-group control-group">
+        <umb-generate-alias enable-lock="true" alias-from="model.property.label" alias="model.property.alias"></umb-generate-alias>
+    </div>
+
+   <div class="umb-control-group control-group">
       <textarea
-      class="editor-description"
-      ng-model="model.property.description"
-      placeholder="Add your description here..."
-      overlay-submit-on-enter
-      umb-auto-resize>
+          class="editor-description"
+          ng-model="model.property.description"
+          placeholder="Add your description here..."
+          overlay-submit-on-enter
+          umb-auto-resize>
       </textarea>
    </div>
 
-   <div class="editor-wrapper umb-control-group clearfix" ng-model="model.property.editor" val-require-component>
+   <div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component>
 
       <a href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openEditorPickerOverlay(model.property)">Add Editor</a>