diff --git a/nymea-app/ui/devicepages/EvChargerThingPage.qml b/nymea-app/ui/devicepages/EvChargerThingPage.qml
index 3a931fbb..6f270943 100644
--- a/nymea-app/ui/devicepages/EvChargerThingPage.qml
+++ b/nymea-app/ui/devicepages/EvChargerThingPage.qml
@@ -70,13 +70,6 @@ ThingPageBase {
                 anchors.centerIn: parent
                 width: background.contentItem.width * .6
                 spacing: Style.margins
-                Label {
-                    text: qsTr("Maximum charging current")
-                    font: Style.smallFont
-                    width: parent.width
-                    horizontalAlignment: Text.AlignHCenter
-                    wrapMode: Text.WordWrap
-                }
 
                 Label {
                     font: Style.largeFont
@@ -84,6 +77,14 @@ ThingPageBase {
                     width: parent.width
                     horizontalAlignment: Text.AlignHCenter
                 }
+
+                Label {
+                    text: qsTr("Maximum charging current")
+                    font: Style.smallFont
+                    width: parent.width
+                    horizontalAlignment: Text.AlignHCenter
+                    wrapMode: Text.WordWrap
+                }
             }
 
             Dial {
diff --git a/nymea-app/ui/devicepages/SmartMeterDevicePage.qml b/nymea-app/ui/devicepages/SmartMeterDevicePage.qml
index 24d4f8a7..c1b68db0 100644
--- a/nymea-app/ui/devicepages/SmartMeterDevicePage.qml
+++ b/nymea-app/ui/devicepages/SmartMeterDevicePage.qml
@@ -140,11 +140,12 @@ ThingPageBase {
                     Label {
                         Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        font: Style.hugeFont
+                        font: Style.largeFont
                         property bool toKilos: currentPower >= 1000
                         property double value: Math.abs(currentPower / (toKilos ? 1000 : 1))
                         text: "%1 %2".arg(value.toFixed(toKilos ? 2 : 1)).arg(toKilos ? "kW" : "W")
                     }
+
                     Label {
                         Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
@@ -171,10 +172,11 @@ ThingPageBase {
                         font: Style.smallFont
                     }
 
+
                     Label {
                         Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        font: Style.hugeFont
+                        font: Style.bigFont
                         visible: batteryLevelState
                         text: "%1 %".arg(batteryLevelState ? batteryLevelState.value : "")
                     }