diff --git a/androidservice/controlviews/Main.qml b/androidservice/controlviews/Main.qml
index be1bb2fa..5544451f 100644
--- a/androidservice/controlviews/Main.qml
+++ b/androidservice/controlviews/Main.qml
@@ -15,7 +15,6 @@ ApplicationWindow {
 
     Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
     Material.background: Style.backgroundColor
-    Material.primary: Style.headerBackgroundColor
     Material.accent: Style.accentColor
     Material.foreground: Style.foregroundColor
 
diff --git a/nymea-app/styles/dark/Style.qml b/nymea-app/styles/dark/Style.qml
index cd3ffbeb..cc56e8fc 100644
--- a/nymea-app/styles/dark/Style.qml
+++ b/nymea-app/styles/dark/Style.qml
@@ -5,9 +5,5 @@ import "../../ui"
 StyleBase {
     backgroundColor: "#303030"
     foregroundColor: "#ffffff"
-
-    headerBackgroundColor: "#303030"
-    headerForegroundColor: "#ffffff"
-
     iconColor: "#fafafa"
 }
diff --git a/nymea-app/styles/energize/Style.qml b/nymea-app/styles/energize/Style.qml
index 4807908a..71a7b04e 100644
--- a/nymea-app/styles/energize/Style.qml
+++ b/nymea-app/styles/energize/Style.qml
@@ -6,9 +6,6 @@ StyleBase {
     backgroundColor: "#ffffff"
     foregroundColor: "#638B87"
 
-    headerBackgroundColor: "#ffffff"
-    headerForegroundColor: "#79a79f"
-
     accentColor: "#8cc1b6"
 
     interfaceColors: {
diff --git a/nymea-app/styles/lime/Style.qml b/nymea-app/styles/lime/Style.qml
index f6e00c5e..dd488b36 100644
--- a/nymea-app/styles/lime/Style.qml
+++ b/nymea-app/styles/lime/Style.qml
@@ -6,9 +6,6 @@ StyleBase {
     backgroundColor: "#151515"
     foregroundColor: "#fefefe"
 
-    headerBackgroundColor: backgroundColor
-    headerForegroundColor: foregroundColor
-
     accentColor: "#ffb0d827"
     iconColor: "#fafafa"
 }
diff --git a/nymea-app/styles/noir/Style.qml b/nymea-app/styles/noir/Style.qml
index d58c3e6c..9f9c98c1 100644
--- a/nymea-app/styles/noir/Style.qml
+++ b/nymea-app/styles/noir/Style.qml
@@ -6,9 +6,6 @@ StyleBase {
     backgroundColor: "#50514f"
     foregroundColor: "#ebebeb"
 
-    headerBackgroundColor: "#494948"
-    headerForegroundColor: foregroundColor
-
     accentColor: "#f45b69"
     iconColor: foregroundColor
 
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index fcbb99fc..820d62fa 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -50,7 +50,6 @@ ApplicationWindow {
 
     Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
     Material.background: Style.backgroundColor
-    Material.primary: Style.headerBackgroundColor
     Material.accent: Style.accentColor
     Material.foreground: Style.foregroundColor
 
@@ -91,7 +90,7 @@ ApplicationWindow {
 
     Component.onCompleted: {
         styleController.setSystemFont(app.font)
-        PlatformHelper.topPanelColor = Style.headerBackgroundColor
+        PlatformHelper.topPanelColor = Style.backgroundColor
         PlatformHelper.bottomPanelColor = Style.backgroundColor
     }
 
diff --git a/nymea-app/ui/StyleBase.qml b/nymea-app/ui/StyleBase.qml
index 9127d69b..a3405182 100644
--- a/nymea-app/ui/StyleBase.qml
+++ b/nymea-app/ui/StyleBase.qml
@@ -7,9 +7,6 @@ Item {
     property color accentColor: "#57baae"
     property color iconColor: "#808080"
 
-    property color headerBackgroundColor: "#ffffff"
-    property color headerForegroundColor: "#202020"
-
     property color tileBackgroundColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.05))
     property color tileForegroundColor: foregroundColor
     property color tileOverlayColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.1))
diff --git a/nymea-app/ui/components/MainPageTabButton.qml b/nymea-app/ui/components/MainPageTabButton.qml
index 5ee35d37..55980f62 100644
--- a/nymea-app/ui/components/MainPageTabButton.qml
+++ b/nymea-app/ui/components/MainPageTabButton.qml
@@ -39,12 +39,6 @@ TabButton {
     property string iconSource
     property var alignment: Qt.Vertical
 
-    Rectangle {
-        anchors.fill: parent
-        color: Material.foreground
-        opacity: 0.05
-    }
-
     contentItem: Item {
         height: root.height
         Grid {