diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts
index 1cb1f625..fefa7479 100644
--- a/nymea-app/translations/nymea-app-de.ts
+++ b/nymea-app/translations/nymea-app-de.ts
@@ -5218,7 +5218,7 @@ Möchtest Du fortfahren?</translation>
     </message>
     <message>
         <source>From battery</source>
-        <translation>Betterie</translation>
+        <translation>Batterie</translation>
     </message>
     <message>
         <source>From grid</source>
diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml
index e7f6de21..2e869d45 100644
--- a/nymea-app/ui/mainviews/EnergyView.qml
+++ b/nymea-app/ui/mainviews/EnergyView.qml
@@ -60,7 +60,7 @@ MainViewBase {
         engine: _engine
     }
 
-    property var thingColors: [Style.blue, Style.green, Style.red, Style.yellow, Style.purple, Style.yellow, Style.lime]
+    property var thingColors: [Style.blue, Style.green, Style.red, Style.yellow, Style.purple, Style.orange, Style.lime]
 
 
     ThingsProxy {
@@ -90,12 +90,6 @@ MainViewBase {
         shownInterfaces: ["smartmeterproducer"]
     }
 
-    ThingsProxy {
-        id: batteries
-        engine: _engine
-        shownInterfaces: ["energystorage"]
-    }
-
     Flickable {
         id: flickable
         anchors.fill: parent
diff --git a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
index fc0521cc..7f654eff 100644
--- a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml
@@ -162,7 +162,6 @@ Item {
         legend.labelColor: Style.foregroundColor
         legend.font: Style.extraSmallFont
 
-
         ValueAxis {
             id: valueAxis
             min: 0
diff --git a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
index d128b85b..2ecf1c6e 100644
--- a/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
+++ b/nymea-app/ui/mainviews/energy/CurrentProductionBalancePieChart.qml
@@ -16,6 +16,11 @@ ChartView {
 
     property EnergyManager energyManager: null
 
+    ThingsProxy {
+        id: batteries
+        engine: _engine
+        shownInterfaces: ["energystorage"]
+    }
     PieSeries {
         id: productionBalanceSeries
         size: 0.9
diff --git a/nymea-app/ui/utils/NymeaUtils.qml b/nymea-app/ui/utils/NymeaUtils.qml
index 15cc025f..53ef3aa5 100644
--- a/nymea-app/ui/utils/NymeaUtils.qml
+++ b/nymea-app/ui/utils/NymeaUtils.qml
@@ -147,6 +147,6 @@ Item {
         return (permissions & requestedScope) === requestedScope;
     }
 
-    property bool inhibitChartsAnimation: ["SM-G950x", "SM-G955x", "SM-G892A"].indexOf(PlatformHelper.deviceModel) >= 0
+    property bool inhibitChartsAnimation: PlatformHelper.deviceModel.startsWith("SM-G950") // Samsung S8 has a buggy GPU driver :(
     property int chartsAnimationOptions: !inhibitChartsAnimation ? ChartView.SeriesAnimations : ChartView.NoAnimation
 }