diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
index 8dd6dc18a..4324cf222 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
@@ -14,8 +14,8 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleBorderWithIcon;
 import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
@@ -27,7 +27,6 @@ import com.vaadin.ui.Link;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
-@Service
 public class CommonDialogWindow extends Window {
 
     private static final long serialVersionUID = -1321949234316858703L;
@@ -48,6 +47,8 @@ public class CommonDialogWindow extends Window {
 
     private HorizontalLayout buttonsLayout;
 
+    protected ValueChangeListener buttonEnableListener;
+
     public CommonDialogWindow() {
 
         init(null, null);
@@ -95,6 +96,7 @@ public class CommonDialogWindow extends Window {
         saveButton = SPUIComponentProvider.getButton(SPUIComponetIdProvider.SAVE_BUTTON, "save", "", "", true,
                 FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class);
         saveButton.setSizeUndefined();
+        saveButton.addStyleName("default-color");
         if (null != saveButtonClickListener) {
             saveButton.addClickListener(saveButtonClickListener);
         } else {
@@ -107,6 +109,7 @@ public class CommonDialogWindow extends Window {
         cancelButton = SPUIComponentProvider.getButton(SPUIComponetIdProvider.CANCEL_BUTTON, "cancel", "", "", true,
                 FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class);
         cancelButton.setSizeUndefined();
+        cancelButton.addStyleName("default-color");
         if (null != cancelButtonClickListener) {
             cancelButton.addClickListener(cancelButtonClickListener);
         } else {
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
index ecacdcd67..802dd5a70 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
@@ -293,4 +293,8 @@
 	padding-bottom: 12px !important;
   }
   
+  .v-button-default-color {
+  	color: #551f62;
+  }
+  
 }