diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index 8ed54d2..20b6673 100644
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -17,11 +17,43 @@
  */
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import "../components"
 
 CoverBackground {
+    id: coverPage
+
+    BatteryGraph {
+        id: batteryGraph
+        x: coverPage.width * 0.3
+        y: coverPage.width * 0.25
+        width: 0.4 * coverPage.width
+
+        onChargingChanged: onChargeChanged()
+        onChargeChanged: {
+            if(charge <= settings.lowerLimit && battery.state === "discharging") {
+                coverText.text = qsTr("Connect\ncharger")
+            }
+            else if(battery.charge >= settings.upperLimit &&
+                    ((battery.state === "charging" && battery.charging === true) || (battery.state === "idle" && battery.charging === false))) {
+                coverText.text = qsTr("Disconnect\ncharger")
+            }
+            else if(battery.charging) {
+                coverText.text = qsTr("Charging...")
+            }
+            else {
+                coverText.text = qsTr("Battery\nBuddy")
+            }
+        }
+    }
     Label {
-        id: label
-        anchors.centerIn: parent
-        text: qsTr("Battery Buddy")
+        id: coverText
+        anchors.top: batteryGraph.bottom
+        anchors.bottom: coverPage.bottom
+        anchors.horizontalCenter: coverPage.horizontalCenter
+        width: coverPage.width * 0.9
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.Wrap
+        maximumLineCount: 2
     }
 }
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 04a209d..aa4bffd 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -121,13 +121,17 @@ Page {
                 text: qsTr("Battery status")
                 color: Theme.highlightColor
             }
-            DetailItem {
-                label: qsTr("Charge:")+"\n"
-                       +qsTr("Charging:")+"\n"
-                       +qsTr("State:")
-                value: battery.charge+"%\n"
-                       +(battery.charging ? qsTr("yes") : qsTr("no"))+"\n"
-                       +statusText[battery.state]
+            Item {
+                width: parent.width
+                // Rotation: width <==> height
+                height: batteryGraph.width
+                BatteryGraph {
+                    id: batteryGraph
+                    transformOrigin: Item.Center
+                    rotation: 90
+                    width: parent.width * 0.2
+                    anchors.centerIn: parent
+                }
             }
             // Detail column
             Column {