diff --git a/nymea-app/ui/delegates/SensorListDelegate.qml b/nymea-app/ui/delegates/SensorListDelegate.qml
index 9948e689..aaae30a9 100644
--- a/nymea-app/ui/delegates/SensorListDelegate.qml
+++ b/nymea-app/ui/delegates/SensorListDelegate.qml
@@ -155,7 +155,7 @@ BigThingTile {
                     name: {
                         switch (model.interfaceName) {
                         case "closablesensor":
-                            return sensorValueDelegate.stateValue && sensorValueDelegate.stateValue.value === true ? Qt.resolvedUrl("qrc:qrc:/icons/sensors/window-closed.svg") : Qt.resolvedUrl("qrc:qrc:/icons/sensors/window-open.svg");
+                            return sensorValueDelegate.stateValue && sensorValueDelegate.stateValue.value === true ? Qt.resolvedUrl("qrc:/icons/sensors/window-closed.svg") : Qt.resolvedUrl("qrc:/icons/sensors/window-open.svg");
                         default:
                             return app.interfacesToIcon([model.interfaceName, "sensor"])
                         }
diff --git a/nymea-app/ui/experiences/heating/Main.qml b/nymea-app/ui/experiences/heating/Main.qml
index 69a77b07..155b0f38 100644
--- a/nymea-app/ui/experiences/heating/Main.qml
+++ b/nymea-app/ui/experiences/heating/Main.qml
@@ -39,7 +39,7 @@ import QtGraphicalEffects 1.0
 Item {
     id: root
     readonly property string title: qsTr("Celsi°s")
-    readonly property string icon: Qt.resolvedUrl("qrc:qrc:/icons/radiator.svg")
+    readonly property string icon: Qt.resolvedUrl("qrc:/icons/radiator.svg")
 
     readonly property Thing duwWpDevice: duwWpFilterModel.count > 0 ? duwWpFilterModel.get(0) : null
     readonly property Thing duwLuDevice: duwLuFilterModel.count > 0 ? duwLuFilterModel.get(0) : null
@@ -152,7 +152,7 @@ Item {
         anchors.centerIn: parent
         width: parent.width - app.margins * 2
         text: qsTr("There is no drexel und weiss heating system set up yet.")
-        imageSource: "qrc:qrc:/icons/radiator.svg"
+        imageSource: "qrc:/icons/radiator.svg"
         buttonVisible: false
         buttonText: qsTr("Set up now")
         visible: duwWpFilterModel.count === 0 && !engine.thingManager.fetchingData
@@ -180,7 +180,7 @@ Item {
                     ColorIcon {
                         Layout.preferredHeight: Style.iconSize
                         Layout.preferredWidth: Style.iconSize
-                        name: "qrc:qrc:/icons/weathericons/wind.svg"
+                        name: "qrc:/icons/weathericons/wind.svg"
                         color: Style.accentColor
                     }
                     Led {
@@ -208,7 +208,7 @@ Item {
                     ColorIcon {
                         Layout.preferredHeight: Style.iconSize
                         Layout.preferredWidth: Style.iconSize
-                        name: "qrc:qrc:/icons/sensors/temperature.svg"
+                        name: "qrc:/icons/sensors/temperature.svg"
                         color: Style.accentColor
                     }
                     Label {
@@ -241,7 +241,7 @@ Item {
                     Layout.preferredWidth: height
                     Layout.alignment: Qt.AlignHCenter
                     color: Style.accentColor
-                    name: "qrc:qrc:/icons/magic.svg"
+                    name: "qrc:/icons/magic.svg"
                     MouseArea {
                         anchors.fill: parent
                         onClicked: pageStack.push("qrc:/ui/magic/ThingRulesPage.qml", {thing: root.duwWpDevice})
@@ -264,7 +264,7 @@ Item {
                         Layout.preferredHeight: Style.iconSize
                         Layout.preferredWidth: Style.iconSize
                         color: Style.accentColor
-                        name: "qrc:qrc:/icons/ventilation.svg"
+                        name: "qrc:/icons/ventilation.svg"
                         PropertyAnimation on rotation {
                             running: root.ventilationLevelState !== null
                             duration: root.ventilationLevelState !== null && root.ventilationLevelState.value > 0
@@ -333,7 +333,7 @@ Item {
 
 
 //            ProgressButton {
-//                imageSource: "qrc:qrc:/icons/system-shutdown.svg"
+//                imageSource: "qrc:/icons/system-shutdown.svg"
 //                Layout.preferredHeight: Style.iconSize * 1.5
 //                Layout.preferredWidth: height
 //                Layout.alignment: Qt.AlignHCenter
diff --git a/nymea-app/ui/mainviews/GaragesView.qml b/nymea-app/ui/mainviews/GaragesView.qml
index 00f537ea..08c275b5 100644
--- a/nymea-app/ui/mainviews/GaragesView.qml
+++ b/nymea-app/ui/mainviews/GaragesView.qml
@@ -70,7 +70,7 @@ MainViewBase {
         width: parent.width - app.margins * 2
         title: qsTr("There are no garage doors set up yet.")
         text: qsTr("Connect your garage doors in order to control them from here.")
-        imageSource: "qrc:qrc:/icons/garage/garage-100.svg"
+        imageSource: "qrc:/icons/garage/garage-100.svg"
         buttonText: qsTr("Add things")
         visible: garagesFilterModel.count === 0 && !engine.thingManager.fetchingData
         onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml"))
diff --git a/nymea-app/ui/mainviews/energy/ConsumerStats.qml b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
index c19ba152..ca8d7fb4 100644
--- a/nymea-app/ui/mainviews/energy/ConsumerStats.qml
+++ b/nymea-app/ui/mainviews/energy/ConsumerStats.qml
@@ -117,7 +117,7 @@ StatsBase {
                         barSet.replace(i, consumption)
                         valueAxis.adjustMax(consumption)
 
-                    } else if (timestamp.getTime() == upcomingTimestamp.getTime() && (previousEntry || !d.loading)) {
+                    } else if (timestamp.getTime() == upcomingTimestamp.getTime() && (previousEntry || !d.loading) && thingPowerLogs.liveEntry()) {
                         var consumption = thingPowerLogs.liveEntry().totalConsumption
 //                        print("it's today for thing", thing.name, consumption, previousEntry)
                         if (previousEntry) {
diff --git a/nymea-app/ui/mainviews/energy/PowerBalanceHistory.qml b/nymea-app/ui/mainviews/energy/PowerBalanceHistory.qml
index be02e35d..8cbb0b80 100644
--- a/nymea-app/ui/mainviews/energy/PowerBalanceHistory.qml
+++ b/nymea-app/ui/mainviews/energy/PowerBalanceHistory.qml
@@ -37,7 +37,7 @@ Item {
         readonly property var startTime: {
             var date = new Date(fixTime(now));
             date.setTime(date.getTime() - range * 60000 + 2000);
-            print("startTIme:", date)
+            print("startTime:", date)
             return date;
         }