diff --git a/nymea-app/styles/dark/Button.qml b/nymea-app/styles/dark/Button.qml
index 35779675..405a144e 100644
--- a/nymea-app/styles/dark/Button.qml
+++ b/nymea-app/styles/dark/Button.qml
@@ -25,8 +25,17 @@ T.Button {
 
     contentItem: Text {
         text: control.text
-        font: control.font
-        color: app.primaryColor
+        color: app.foregroundColor
+        font.bold: control.font.bold
+        font.capitalization: Font.AllUppercase
+        font.family: control.font.family
+        font.hintingPreference: control.font.hintingPreference
+        font.italic: control.font.italic
+        font.letterSpacing: 2
+        font.overline: control.font.overline
+        font.pixelSize: app.smallFont
+        font.weight: Font.Bold
+
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
diff --git a/nymea-app/styles/light/Button.qml b/nymea-app/styles/light/Button.qml
index 35779675..4968a071 100644
--- a/nymea-app/styles/light/Button.qml
+++ b/nymea-app/styles/light/Button.qml
@@ -25,7 +25,15 @@ T.Button {
 
     contentItem: Text {
         text: control.text
-        font: control.font
+        font.bold: control.font.bold
+        font.capitalization: Font.AllUppercase
+        font.family: control.font.family
+        font.hintingPreference: control.font.hintingPreference
+        font.italic: control.font.italic
+        font.letterSpacing: 2
+        font.overline: control.font.overline
+        font.pixelSize: app.smallFont
+        font.weight: Font.Bold
         color: app.primaryColor
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
diff --git a/nymea-app/styles/noir/Button.qml b/nymea-app/styles/noir/Button.qml
index 35779675..ebaa41a9 100644
--- a/nymea-app/styles/noir/Button.qml
+++ b/nymea-app/styles/noir/Button.qml
@@ -25,8 +25,16 @@ T.Button {
 
     contentItem: Text {
         text: control.text
-        font: control.font
-        color: app.primaryColor
+        font.bold: control.font.bold
+        font.capitalization: Font.AllUppercase
+        font.family: control.font.family
+        font.hintingPreference: control.font.hintingPreference
+        font.italic: control.font.italic
+        font.letterSpacing: control.font.letterSpacing
+        font.overline: control.font.overline
+        font.pixelSize: app.smallFont
+        font.weight: Font.Bold
+        color: app.foregroundColor
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight