diff --git a/nymea-app/ui/MainPage.qml b/nymea-app/ui/MainPage.qml
index 6042ec7a..d85594d9 100644
--- a/nymea-app/ui/MainPage.qml
+++ b/nymea-app/ui/MainPage.qml
@@ -400,7 +400,6 @@ Page {
                     Layout.fillHeight: true
                     alignment: app.landscape ? Qt.Horizontal : Qt.Vertical
                     checked: index === swipeView.currentIndex
-                    height: tabBar.height
 //                    anchors.verticalCenter: parent.verticalCenter
                     text: model.displayName
                     iconSource: "../images/" + model.icon + ".svg"
diff --git a/nymea-app/ui/components/NymeaToolTip.qml b/nymea-app/ui/components/NymeaToolTip.qml
index f3705217..83fef8f4 100644
--- a/nymea-app/ui/components/NymeaToolTip.qml
+++ b/nymea-app/ui/components/NymeaToolTip.qml
@@ -15,7 +15,7 @@ Item {
 
     Rectangle {
         id: blurSource
-        anchors.fill: toolTip
+        anchors.fill: parent
         color: Style.backgroundColor
         visible: false
         radius: Style.smallCornerRadius
@@ -27,10 +27,10 @@ Item {
     }
 
     FastBlur {
-        anchors.fill: toolTip
+        anchors.fill: parent
         source: blurSource
         radius: 32
-        visible: toolTip.visible
+        visible: root.visible
     }
 
     Rectangle {
diff --git a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
index 28bee1cb..014d631e 100644
--- a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml
@@ -53,7 +53,9 @@ ChartView {
                 consumersSummation += consumers.get(i).stateByName("currentPower").value
             }
             d.consumersSummation = consumersSummation;
-            d.unknownSlice.value = Math.max(0, energyManager.currentPowerConsumption - consumersSummation)
+            if (d.unknownSlice) {
+                d.unknownSlice.value = Math.max(0, energyManager.currentPowerConsumption - consumersSummation)
+            }
         }
     }
 
@@ -84,8 +86,9 @@ ChartView {
             var consumer = consumers.get(i)
             let currentPowerState = consumer.stateByName("currentPower")
             let slice = consumersBalanceSeries.append(consumer.name, currentPowerState.value)
-//            slice.color = root.colors[i % root.colors.length]
             slice.color = NymeaUtils.generateColor(Style.generationBaseColor, i)
+            slice.borderWidth = 0
+            slice.borderColor = slice.color
             colorMap[consumer] = slice.color
             currentPowerState.valueChanged.connect(function() {
                 slice.value = currentPowerState.value
@@ -99,6 +102,8 @@ ChartView {
             print("Unknown consumption:", unknownConsumption, "consumption balance", energyManager.currentPowerConsumption, "consumers summation:", consumersSummation)
             d.unknownSlice = consumersBalanceSeries.append(qsTr("Unknown"), unknownConsumption)
             d.unknownSlice.color = Style.gray
+            d.unknownSlice.borderColor = Style.gray
+            d.unknownSlice.borderWidth = 0
         }
 
         d.thingsColorMap = colorMap
@@ -230,6 +235,4 @@ ChartView {
         name: "down"
         visible: !centerLayout.atYEnd
     }
-
-
 }
diff --git a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
index 1a0bce3e..213b44c2 100644
--- a/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentConsumptionBalancePieChart.qml
@@ -38,22 +38,26 @@ ChartView {
 
         PieSlice {
             color: Style.red
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: consumptionBalanceSeries.fromGrid
         }
         PieSlice {
             color: Style.green
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: consumptionBalanceSeries.fromProduction
         }
         PieSlice {
             color: Style.orange
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: consumptionBalanceSeries.fromStorage
         }
         PieSlice {
-            color: Style.backgroundColor
-            borderColor: Style.foregroundColor
+            color: Style.tileBackgroundColor
+            borderColor: color
+            borderWidth: 0
             value: consumptionBalanceSeries.fromGrid == 0 && consumptionBalanceSeries.fromProduction == 0 && consumptionBalanceSeries.fromStorage == 0 ? 1 : 0
         }
     }
diff --git a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
index f9e1b221..16091f9d 100644
--- a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
@@ -37,22 +37,26 @@ ChartView {
 
         PieSlice {
             color: Style.red
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: productionBalanceSeries.toConsumers
         }
         PieSlice {
             color: Style.green
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: productionBalanceSeries.toGrid
         }
         PieSlice {
             color: Style.orange
-            borderColor: Style.foregroundColor
+            borderColor: color
+            borderWidth: 0
             value: productionBalanceSeries.toStorage
         }
         PieSlice {
-            color: Style.backgroundColor
-            borderColor: Style.foregroundColor
+            color: Style.tooltipBackgroundColor
+            borderColor: color
+            borderWidth: 0
             value: productionBalanceSeries.toConsumers == 0 && productionBalanceSeries.toGrid == 0 && productionBalanceSeries.toStorage == 0 ? 1 : 0
         }
     }
diff --git a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
index 9da5b7fb..422b7842 100644
--- a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
+++ b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
@@ -100,10 +100,14 @@ StatsBase {
                     valueAxis.adjustMax(production)
                 }
                 var acquisition = root.energyManager.totalAcquisition - (start ? start.totalAcquisition : 0)
-                d.acquisitionSet.replace(d.acquisitionSet.count - 1, acquisition)
+                if (d.acquisitionSet) {
+                    d.acquisitionSet.replace(d.acquisitionSet.count - 1, acquisition)
+                }
                 valueAxis.adjustMax(acquisition)
                 var ret = root.energyManager.totalReturn - (start ? start.totalReturn : 0)
-                d.returnSet.replace(d.returnSet.count - 1, ret)
+                if (d.returnSet) {
+                    d.returnSet.replace(d.returnSet.count - 1, ret)
+                }
                 valueAxis.adjustMax(ret)
             }
         }