diff --git a/services/static-webserver/client/source/class/osparc/desktop/credits/ProfilePage.js b/services/static-webserver/client/source/class/osparc/desktop/credits/ProfilePage.js
index 501290e9952..45a65bb74cc 100644
--- a/services/static-webserver/client/source/class/osparc/desktop/credits/ProfilePage.js
+++ b/services/static-webserver/client/source/class/osparc/desktop/credits/ProfilePage.js
@@ -135,6 +135,8 @@ qx.Class.define("osparc.desktop.credits.ProfilePage", {
       namesValidator.add(lastName, qx.util.Validate.regExp(/^$|[^\.\d]+/), this.tr("Avoid dots or numbers in text")); // allow also empty last name
 
       const updateBtn = new qx.ui.form.Button("Update Profile").set({
+        appearance: "form-button",
+        alignX: "left",
         allowGrowX: false
       });
       box.add(updateBtn);
@@ -266,6 +268,8 @@ qx.Class.define("osparc.desktop.credits.ProfilePage", {
       });
 
       const resetBtn = new qx.ui.form.Button("Reset Password").set({
+        appearance: "form-button",
+        alignX: "left",
         allowGrowX: false
       });
       box.add(resetBtn);
diff --git a/services/static-webserver/client/source/class/osparc/theme/Appearance.js b/services/static-webserver/client/source/class/osparc/theme/Appearance.js
index dae7a6598eb..4f0dd895102 100644
--- a/services/static-webserver/client/source/class/osparc/theme/Appearance.js
+++ b/services/static-webserver/client/source/class/osparc/theme/Appearance.js
@@ -40,13 +40,13 @@ qx.Theme.define("osparc.theme.Appearance", {
           backgroundColor: "default-button"
         };
         if (states.hovered) {
-          style.backgroundColor = "default-button-hover";
+          style.backgroundColor = "default-button-hover-background";
         }
         if (states.focused) {
-          style.decorator = "form-button-focus";
+          style.backgroundColor = "default-button-hover-background";
         }
         if (states.disabled) {
-          style.backgroundColor = "transparent";
+          style.backgroundColor = "default-button-disabled-background";
         }
         return style;
       }
@@ -655,7 +655,8 @@ qx.Theme.define("osparc.theme.Appearance", {
     "danger-button": {
       include: "material-button",
       style: state => ({
-        backgroundColor: state.hovered || state.focused ? "info" : "error",
+        decorator: state.hovered || state.focused ? "form-button-danger-hover" : "form-button-danger",
+        backgroundColor: state.hovered || state.focused ? "default-button-hover-background" : "error",
         textColor: state.hovered || state.focused ? "default-button-text" : "default-button-text" // dark theme's text color
       })
     },
diff --git a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
index 85ac46ad1cd..f84883e1438 100644
--- a/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
+++ b/services/static-webserver/client/source/class/osparc/theme/ColorLight.js
@@ -81,10 +81,10 @@ qx.Theme.define("osparc.theme.ColorLight", {
     // material-button
     "material-button-background":  "fab_background",
     "material-button-background-disabled":  "transparent",
-    "material-button-background-hovered":  "default-button-hover",
-    "material-button-background-pressed":  "default-button-active",
+    "material-button-background-hovered":  "default-button-hover-background",
+    "material-button-background-pressed":  "default-button-active-background",
     "material-button-text-disabled": "default-button-text-disabled",
-    "material-button-text": "text",
+    "material-button-text": "default-button-text",
 
     // material-textfield
     "material-textfield": "input_background",
diff --git a/services/static-webserver/client/source/class/osparc/theme/Decoration.js b/services/static-webserver/client/source/class/osparc/theme/Decoration.js
index d6869644a24..e899829a8a4 100644
--- a/services/static-webserver/client/source/class/osparc/theme/Decoration.js
+++ b/services/static-webserver/client/source/class/osparc/theme/Decoration.js
@@ -336,11 +336,27 @@ qx.Theme.define("osparc.theme.Decoration", {
         backgroundColor: "transparent"
       }
     },
+    "form-button-danger": {
+      include:"form-button-outlined",
+      style: {
+        color: "error",
+        width: 1,
+        style: "solid"
+      }
+    },
+    "form-button-danger-hover": {
+      include:"form-button-outlined",
+      style: {
+        color: "error",
+        width: 1,
+        style: "solid"
+      }
+    },
     "form-button-hover": {
       include: "form-button",
       style: {
         color: "default-button-hover",
-        backgroundColor: "default-button-hover"
+        backgroundColor: "default-button-hover-background"
       }
     },
     "form-button-focus": {
diff --git a/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js b/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js
index ee366d599dd..d9b2b0f8d39 100644
--- a/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js
+++ b/services/static-webserver/client/source/class/osparc/theme/mixin/Color.js
@@ -21,6 +21,7 @@ qx.Theme.define("osparc.theme.mixin.Color", {
     "default-button-text": "rgba(255, 255, 255, 1)",
     "default-button-text-outline": "rgba(229, 229, 229, 1)",
     "default-button-text-disabled": "rgba(113, 157, 181, 1)",
+    "default-button-disabled-background": "transparent",
     "default-button": "rgba(10, 182, 255, 1)",
     "default-button-hover": "rgba(4, 73, 102, 1)",
     "default-button-active": "rgba(9, 89, 122, 1)",