diff --git a/res/skins/Deere/icon/ic_battery_unknown_48px.svg b/res/skins/Deere/icon/ic_battery_unknown_48px.svg
deleted file mode 100644
index 071595e2d16..00000000000
--- a/res/skins/Deere/icon/ic_battery_unknown_48px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m31.33 8h-3.33v-4h-8v4h-3.33c-1.48 0-2.67 1.18-2.67 2.66v30.67c0 1.47 1.19 2.67 2.67 2.67h14.67c1.47 0 2.66-1.19 2.66-2.67v-30.67c-0.01-1.48-1.19-2.6556-2.67-2.66z" fill="#5f5f5f"/><path d="m28.6 25.37s-0.76 0.84-1.34 1.42c-0.97 0.97-1.66 2.29-1.66 3.2h-3.2c0-1.66 0.92-3.05 1.86-3.99l1.86-1.89c0.54-0.54 0.88-1.29 0.88-2.12 0-1.66-1.34-3-3-3s-3 1.34-3 3h-3c0-3.31 2.69-6 6-6s6 2.69 6 6c0 1.32-0.53 2.52-1.4 3.38zm-2.7 10.52h-3.8v-3.8h3.8z" fill="#dfdfdf"/></svg>
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 6a5f87c07a2..397885f8447 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -15,7 +15,6 @@
         <ObjectName>Battery</ObjectName>
         <Size>24,24</Size>
         <SizePolicy>f,f</SizePolicy>
-        <PixmapUnknown scalemode="STRETCH_ASPECT">icon/ic_battery_unknown_48px.svg</PixmapUnknown>
         <PixmapCharged scalemode="STRETCH_ASPECT">icon/ic_battery_charged_48px.svg</PixmapCharged>
         <NumberStates>8</NumberStates>
         <PixmapsCharging scalemode="STRETCH_ASPECT">icon/ic_battery_charging_%1_48px.svg</PixmapsCharging>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_unknown.svg b/res/skins/Tango/graphics/batt/ic_battery_unknown.svg
deleted file mode 100644
index 269589e46ba..00000000000
--- a/res/skins/Tango/graphics/batt/ic_battery_unknown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m31.33 8h-3.33v-4h-8v4h-3.33c-1.48 0-2.67 1.18-2.67 2.66v30.67c0 1.47 1.19 2.67 2.67 2.67h14.67c1.47 0 2.66-1.19 2.66-2.67v-30.67c-0.01-1.48-1.19-2.6556-2.67-2.66z" fill="#5f5f5f"/><path d="m28.6 25.37s-0.76 0.84-1.34 1.42c-0.97 0.97-1.66 2.29-1.66 3.2h-3.2c0-1.66 0.92-3.05 1.86-3.99l1.86-1.89c0.54-0.54 0.88-1.29 0.88-2.12 0-1.66-1.34-3-3-3s-3 1.34-3 3h-3c0-3.31 2.69-6 6-6s6 2.69 6 6c0 1.32-0.53 2.52-1.4 3.38zm-2.7 10.52h-3.8v-3.8h3.8z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 009e97b962e..34367255e0b 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -283,7 +283,6 @@ Description:
             <ObjectName>Battery</ObjectName>
             <Size>24,24</Size>
             <SizePolicy>f,f</SizePolicy>
-            <PixmapUnknown scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_unknown.svg</PixmapUnknown>
             <PixmapCharged scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charged.svg</PixmapCharged>
             <NumberStates>8</NumberStates>
             <PixmapsCharging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charging_%1.svg</PixmapsCharging>
diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp
index 70b6d6cf1dc..afb3bb82831 100644
--- a/src/widget/wbattery.cpp
+++ b/src/widget/wbattery.cpp
@@ -8,6 +8,7 @@
 WBattery::WBattery(QWidget* parent)
         : WWidget(parent),
           m_pBattery(Battery::getBattery(this)) {
+    setVisible(false);
     if (m_pBattery) {
         connect(m_pBattery.data(), SIGNAL(stateChanged()),
                 this, SLOT(update()));
@@ -23,14 +24,6 @@ void WBattery::setup(const QDomNode& node, const SkinContext& context) {
                   context.getScaleFactor());
     }
 
-    QDomElement unknownPath = context.selectElement(node, "PixmapUnknown");
-    if (!unknownPath.isNull()) {
-        setPixmap(&m_pPixmapUnknown,
-                  context.getPixmapSource(unknownPath),
-                  context.selectScaleMode(unknownPath, Paintable::TILE),
-                  context.getScaleFactor());
-    }
-
     QDomElement chargedPath = context.selectElement(node, "PixmapCharged");
     if (!chargedPath.isNull()) {
         setPixmap(&m_pPixmapCharged,
@@ -99,9 +92,8 @@ void WBattery::update() {
 
     if (chargingState != Battery::UNKNOWN) {
         setBaseTooltip(QString("%1\%").arg(dPercentage, 0, 'f', 0));
-    } else {
-        setBaseTooltip(tr("Battery status unknown."));
     }
+
     m_pCurrentPixmap.clear();
     switch (chargingState) {
         case Battery::CHARGING:
@@ -130,11 +122,10 @@ void WBattery::update() {
             m_pCurrentPixmap = m_pPixmapCharged;
             appendBaseTooltip("\n" + tr("Battery fully charged."));
             break;
-        case Battery::UNKNOWN:
         default:
-            m_pCurrentPixmap = m_pPixmapUnknown;
             break;
     }
+    setVisible(chargingState != Battery::UNKNOWN);
 
     // call parent's update() to show changes, this should call
     // QWidget::update()