diff --git a/res/skins/Tango/graphics/batt/battery_0_charging.svg b/res/skins/Tango/graphics/batt/battery_0_charging.svg
deleted file mode 100644
index 3bad64d813f..00000000000
--- a/res/skins/Tango/graphics/batt/battery_0_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#ff1ff6"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_0_discharging.svg b/res/skins/Tango/graphics/batt/battery_0_discharging.svg
deleted file mode 100644
index fbe0337064f..00000000000
--- a/res/skins/Tango/graphics/batt/battery_0_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#ff1ff6"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_1_charging.svg b/res/skins/Tango/graphics/batt/battery_1_charging.svg
deleted file mode 100644
index 33079848d62..00000000000
--- a/res/skins/Tango/graphics/batt/battery_1_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M6 5v8h14v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h2v8H4z" fill="#ff1ff6"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_1_discharging.svg b/res/skins/Tango/graphics/batt/battery_1_discharging.svg
deleted file mode 100644
index a7935b4f18b..00000000000
--- a/res/skins/Tango/graphics/batt/battery_1_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M6 5v8h14v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h2v8H4z" fill="#ff1ff6"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_2_charging.svg b/res/skins/Tango/graphics/batt/battery_2_charging.svg
deleted file mode 100644
index 951a813fab7..00000000000
--- a/res/skins/Tango/graphics/batt/battery_2_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M8 5v8h12v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h4v8H4z" fill="#fc0000"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_2_discharging.svg b/res/skins/Tango/graphics/batt/battery_2_discharging.svg
deleted file mode 100644
index 25544d71790..00000000000
--- a/res/skins/Tango/graphics/batt/battery_2_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M8 5v8h12v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h4v8H4z" fill="#fc0000"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_3_charging.svg b/res/skins/Tango/graphics/batt/battery_3_charging.svg
deleted file mode 100644
index c00fe3eb701..00000000000
--- a/res/skins/Tango/graphics/batt/battery_3_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M4 5h6v8H4z" fill="#fe9500"/><path d="M10 5v8h10v-2h2V7h-2V5z" fill="#888"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_3_discharging.svg b/res/skins/Tango/graphics/batt/battery_3_discharging.svg
deleted file mode 100644
index c653cea322e..00000000000
--- a/res/skins/Tango/graphics/batt/battery_3_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M10 5v8h10v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h6v8H4z" fill="#fe9500"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_4_charging.svg b/res/skins/Tango/graphics/batt/battery_4_charging.svg
deleted file mode 100644
index 96effa27864..00000000000
--- a/res/skins/Tango/graphics/batt/battery_4_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M12 5v8h8v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h8v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_4_discharging.svg b/res/skins/Tango/graphics/batt/battery_4_discharging.svg
deleted file mode 100644
index b0e67a5a153..00000000000
--- a/res/skins/Tango/graphics/batt/battery_4_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M12 5v8h8v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h8v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_5_charging.svg b/res/skins/Tango/graphics/batt/battery_5_charging.svg
deleted file mode 100644
index 1ff7e351b51..00000000000
--- a/res/skins/Tango/graphics/batt/battery_5_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M14 5v8h6v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h10v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_5_discharging.svg b/res/skins/Tango/graphics/batt/battery_5_discharging.svg
deleted file mode 100644
index 0f49e018058..00000000000
--- a/res/skins/Tango/graphics/batt/battery_5_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M14 5v8h6v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h10v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_6_charging.svg b/res/skins/Tango/graphics/batt/battery_6_charging.svg
deleted file mode 100644
index cac4ed37f5e..00000000000
--- a/res/skins/Tango/graphics/batt/battery_6_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M16 5v8h4v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h12v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_6_discharging.svg b/res/skins/Tango/graphics/batt/battery_6_discharging.svg
deleted file mode 100644
index 1d35fb18e8e..00000000000
--- a/res/skins/Tango/graphics/batt/battery_6_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M16 5v8h4v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h12v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_7_charging.svg b/res/skins/Tango/graphics/batt/battery_7_charging.svg
deleted file mode 100644
index 956cb547fd9..00000000000
--- a/res/skins/Tango/graphics/batt/battery_7_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_7_discharging.svg b/res/skins/Tango/graphics/batt/battery_7_discharging.svg
deleted file mode 100644
index 1597d3861be..00000000000
--- a/res/skins/Tango/graphics/batt/battery_7_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_8_charging.svg b/res/skins/Tango/graphics/batt/battery_8_charging.svg
deleted file mode 100644
index 2a93f6211f4..00000000000
--- a/res/skins/Tango/graphics/batt/battery_8_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M20 5v8-2h2V7h-2V5z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_8_discharging.svg b/res/skins/Tango/graphics/batt/battery_8_discharging.svg
deleted file mode 100644
index 1597d3861be..00000000000
--- a/res/skins/Tango/graphics/batt/battery_8_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v8h2v-2h2V7h-2V5z" fill="#888"/><path d="M4 5h14v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_9_charging.svg b/res/skins/Tango/graphics/batt/battery_9_charging.svg
deleted file mode 100644
index 88a337ea969..00000000000
--- a/res/skins/Tango/graphics/batt/battery_9_charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M20 11h2V7h-2z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/><path d="m15.885 2.0065-6.9929 6.4109 2.6226 1.4568-3.3991 6.1193 6.9929-6.4109-2.6226-1.4568 3.3991-6.1193z"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_9_discharging.svg b/res/skins/Tango/graphics/batt/battery_9_discharging.svg
deleted file mode 100644
index 54c808c54b1..00000000000
--- a/res/skins/Tango/graphics/batt/battery_9_discharging.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M20 11h2V7h-2z" fill="#888"/><path d="M4 5h16v8H4z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/battery_charged.svg b/res/skins/Tango/graphics/batt/battery_charged.svg
deleted file mode 100644
index 6e9f74cefc9..00000000000
--- a/res/skins/Tango/graphics/batt/battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M4 5v8h16v-2h2V7h-2V5z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charged.svg b/res/skins/Tango/graphics/batt/ic_battery_charged.svg
new file mode 100644
index 00000000000..6841f417712
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charged.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-2.3301h-2e-3l2e-3 -28.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4zm6 10v11h4l-8 15v-11h-4z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_0.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_0.svg
new file mode 100644
index 00000000000..22437af77b4
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_0.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22.236 39.557-0.23633 0.44336v-0.44336h-8v1.7734c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7734h-2e-3z" fill="#f00"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.889h8v-10.557h-4l8-15v11h4l-7.7637 14.557h11.762l0.001953-28.889c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_1.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_1.svg
new file mode 100644
index 00000000000..10922079396
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_1.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22 35.111h-8v6.2188c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2188h-9.3926l-2.6074 4.8887z" fill="#ff5c00"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.443h8v-6.1113h-4l8-15v11h4l-5.3926 10.111h9.3906l0.001953-24.443c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_2.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_2.svg
new file mode 100644
index 00000000000..7aae0ef1f8e
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_2.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22 30.668h-8v10.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.662h-7.0235l-4.9765 9.332z" fill="#ffb108"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v20h8v-1.668h-4l8-15v11h4l-3.0234 5.668h7.0215l2e-3 -20c-0.010047-1.4798-1.1987-2.6677-2.6778-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_3.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_3.svg
new file mode 100644
index 00000000000..9ec7b713351
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_3.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m19.48 26.223h-5.4805v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-4.6524l-7.3476 13.777v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555h5.4805l6.5195-12.223v11h4l-0.65234 1.2227h4.6504l0.001953-15.555c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_4.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_4.svg
new file mode 100644
index 00000000000..81890a03dfc
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_4.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m21.852 21.777h-7.8516v19.553c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.553h-8v3.2227h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.109h7.8516l4.1484-7.7773v7.7773h7.998l0.001953-11.109c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_5.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_5.svg
new file mode 100644
index 00000000000..37484a54030
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_5.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m24.223 17.334h-10.223v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-8v7.666h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666h10.223l1.7773-3.334v3.334h7.998l0.001953-6.666c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_6.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_6.svg
new file mode 100644
index 00000000000..afcdfaff53b
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_6.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-2e-3zm12 1.1113v11h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m33.999 12.889 1e-3 -2.221c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_charging_7.svg b/res/skins/Tango/graphics/batt/ic_battery_charging_7.svg
new file mode 100644
index 00000000000..e1f4f4997dd
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_charging_7.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m16.668 8c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-2e-3l2e-3 -1.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-11.322zm9.332 6v11h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h8v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_0.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_0.svg
new file mode 100644
index 00000000000..d256dd35e5c
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_0.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 39.556v1.7741c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7741h-2e-3 1e-3z" fill="#f00"/><path d="m33.999 39.556 1e-3 -28.888c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.888z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_1.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_1.svg
new file mode 100644
index 00000000000..a96ada813c5
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_1.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 35.112v6.2181c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2181h-2e-3 1e-3z" fill="#ff5c00"/><path d="m33.999 35.112 1e-3 -24.444c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.444z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_2.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_2.svg
new file mode 100644
index 00000000000..c3150d2e308
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_2.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 30.667v10.663c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.663h-2e-3 1e-3z" fill="#ffb108"/><path d="m33.999 30.667 1e-3 -19.999c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v19.999z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_3.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_3.svg
new file mode 100644
index 00000000000..7aa843cc038
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_3.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 26.223v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 26.223 1e-3 -15.555c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_4.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_4.svg
new file mode 100644
index 00000000000..e3831a7f41c
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_4.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 21.778v19.552c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.552h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 21.778 1e-3 -11.11c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.11z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_5.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_5.svg
new file mode 100644
index 00000000000..3824ad247ec
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_5.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 17.334v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 17.334 1e-3 -6.666c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_6.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_6.svg
new file mode 100644
index 00000000000..97ace39848f
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_6.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 12.889 1e-3 -2.221c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_discharging_7.svg b/res/skins/Tango/graphics/batt/ic_battery_discharging_7.svg
new file mode 100644
index 00000000000..c476b0cb686
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_discharging_7.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m20 8h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-2e-3l2e-3 -1.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223z" fill="#b4b4b4"/><path d="m20 4v4h8v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/Tango/graphics/batt/ic_battery_unknown.svg b/res/skins/Tango/graphics/batt/ic_battery_unknown.svg
new file mode 100644
index 00000000000..269589e46ba
--- /dev/null
+++ b/res/skins/Tango/graphics/batt/ic_battery_unknown.svg
@@ -0,0 +1 @@
+<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 15befc84f01..75b9302c5e1 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -278,7 +278,16 @@ Description:
             <SetVariable name="ConfigKeyDisp">[Shoutcast],status</SetVariable>
           </Template>
 
-          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
+          <Battery>
+            <ObjectName>Battery</ObjectName>
+            <Size>28,28</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>
+            <PixmapsDischarging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
+          </Battery>
 
           <WidgetGroup><!-- Clock + latency display -->
             <ObjectName>ClockBox</ObjectName>