diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
index 92f06bbc3..a10176235 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
@@ -275,8 +275,8 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
          * distribution Id of the edit window is different then the "existingDs"
          */
         if (existingDs != null && !existingDs.getId().equals(editDistId)) {
-            distNameTextField.addStyleName("v-textfield-error");
-            distVersionTextField.addStyleName("v-textfield-error");
+            distNameTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
+            distVersionTextField.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
             notificationMessage.displayValidationError(
                     i18n.get("message.duplicate.dist", new Object[] { existingDs.getName(), existingDs.getVersion() }));
 
@@ -293,10 +293,10 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
     public void resetComponents() {
         editDistribution = Boolean.FALSE;
         distNameTextField.clear();
-        distNameTextField.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_ERROR);
+        distNameTextField.removeStyleName("v-textfield-error");
         distVersionTextField.clear();
-        distVersionTextField.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_ERROR);
-        distsetTypeNameComboBox.removeStyleName(SPUIStyleDefinitions.SP_COMBOFIELD_ERROR);
+        distVersionTextField.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
+        distsetTypeNameComboBox.removeStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT);
         descTextArea.clear();
         reqMigStepCheckbox.clear();
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java
index 2541348b6..4c8c0ac0b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java
@@ -31,6 +31,8 @@ public final class SPUIStyleDefinitions {
      */
     public static final String SP_TEXTFIELD_ERROR = "textfield-error";
 
+    public static final String SP_TEXTFIELD_LAYOUT_ERROR_HIGHTLIGHT = "v-textfield-error";
+
     /**
      * STYLE to highlight wrong data combo box field.
      */
@@ -136,11 +138,11 @@ public final class SPUIStyleDefinitions {
      * Artifact Details icon in Distribution View.
      */
     public static final String ARTIFACT_DTLS_ICON = "swm-artifact-dtls-icon";
-    
-   /**
-    * Distribution metadata icon style.
-    */
-   public static final String DS_METADATA_ICON = "ds-metadata-icon";
+
+    /**
+     * Distribution metadata icon style.
+     */
+    public static final String DS_METADATA_ICON = "ds-metadata-icon";
 
     /**
      * Target table style.
@@ -302,11 +304,11 @@ public final class SPUIStyleDefinitions {
      * Grid style.
      */
     public static final String METADATA_GRID = "metadata-grid";
-    
+
     /**
      * Footer layout style.
      */
-    public static final String FOOTER_LAYOUT = "footer-layout"; 
+    public static final String FOOTER_LAYOUT = "footer-layout";
 
     /**
      * Constructor.