battery fixes

8 files changed, 19 insertions, 24 deletions

diff --git a/_icons/battery-1.svg b/_icons/battery-1.svg
index c082d7ec..f1f705c4 100644
--- a/_icons/battery-1.svg
+++ b/_icons/battery-1.svg
@@ -2,8 +2,7 @@
 group: battery
 ---
 <svg>
-  <rect x="4" y="7" width="15" height="10" rx="2"></rect>
-  <rect x="19" y="10" width="1" height="4" ></rect>
+  <path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
   <polyline points="7 10 7 14"></polyline>
 </svg>
 
diff --git a/_icons/battery-2.svg b/_icons/battery-2.svg
index 6b8743a9..5c95433f 100644
--- a/_icons/battery-2.svg
+++ b/_icons/battery-2.svg
@@ -2,8 +2,7 @@
 group: battery
 ---
 <svg>
-  <rect x="4" y="7" width="15" height="10" rx="2"></rect>
-  <rect x="19" y="10" width="1" height="4" ></rect>
+  <path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
   <polyline points="7 10 7 14"></polyline>
   <polyline points="10 10 10 14"></polyline>
 </svg>
diff --git a/_icons/battery-3.svg b/_icons/battery-3.svg
index 5b3cd20c..652a7ee7 100644
--- a/_icons/battery-3.svg
+++ b/_icons/battery-3.svg
@@ -2,8 +2,7 @@
 group: battery
 ---
 <svg>
-  <rect x="4" y="7" width="15" height="10" rx="2"></rect>
-  <rect x="19" y="10" width="1" height="4" ></rect>
+  <path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
   <polyline points="7 10 7 14"></polyline>
   <polyline points="10 10 10 14"></polyline>
   <polyline points="13 10 13 14"></polyline>
diff --git a/_icons/battery-4.svg b/_icons/battery-4.svg
index 122b75e3..9c0ce4b0 100644
--- a/_icons/battery-4.svg
+++ b/_icons/battery-4.svg
@@ -2,8 +2,7 @@
 group: battery
 ---
 <svg>
-  <rect x="4" y="7" width="15" height="10" rx="2"></rect>
-  <rect x="19" y="10" width="1" height="4" ></rect>
+  <path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
   <polyline points="7 10 7 14"></polyline>
   <polyline points="10 10 10 14"></polyline>
   <polyline points="13 10 13 14"></polyline>
diff --git a/_icons/battery-charging.svg b/_icons/battery-charging.svg
index 40756055..09126e02 100644
--- a/_icons/battery-charging.svg
+++ b/_icons/battery-charging.svg
@@ -2,7 +2,7 @@
 group: battery
 ---
 <svg>
-  <path d="M7 7H6a2 2 0 00-2 2v6a2 2 0 002 2h2m7-10h2a2 2 0 012 2v6a2 2 0 01-2 2h-1" />
-  <rect x="19" y="10" width="1" height="4" ></rect>
+  <path d="M15 7h2a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-1"/>
+  <path d="M7 7H6a2 2 0 00-2 2v6a2 2 0 002 2h2" />
   <polyline points="11 8 10 12 13 12 12 16"></polyline>
 </svg>
diff --git a/_icons/battery-empty.svg b/_icons/battery-empty.svg
deleted file mode 100644
index cd1d2734..00000000
--- a/_icons/battery-empty.svg
+++ /dev/null
@@ -1,7 +0,0 @@
----
-group: battery
----
-<svg>
-  <rect x="4" y="7" width="15" height="10" rx="2"></rect>
-  <rect x="19" y="10" width="1" height="4" ></rect>
-</svg>
diff --git a/_icons/battery.svg b/_icons/battery.svg
new file mode 100644
index 00000000..38ac7a38
--- /dev/null
+++ b/_icons/battery.svg
@@ -0,0 +1,6 @@
+---
+group: battery
+---
+<svg>
+  <path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
+</svg>
diff --git a/icons.svg b/icons.svg
index e9d73855..685ca8ea 100644
--- a/icons.svg
+++ b/icons.svg
@@ -66,17 +66,17 @@
 </symbol>
 	<symbol id="tabler-arrow-up" class="icon tabler-icon tabler-icon-arrow-up" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19" /><line x1="19" y1="12" x2="12" y2="5" /><line x1="5" y1="12" x2="12" y2="5" />
 </symbol>
-	<symbol id="tabler-battery-1" class="icon tabler-icon tabler-icon-battery-1" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="7" width="15" height="10" rx="2"></rect><rect x="19" y="10" width="1" height="4" ></rect><polyline points="7 10 7 14"></polyline>
+	<symbol id="tabler-battery-1" class="icon tabler-icon tabler-icon-battery-1" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path><polyline points="7 10 7 14"></polyline>
 </symbol>
-	<symbol id="tabler-battery-2" class="icon tabler-icon tabler-icon-battery-2" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="7" width="15" height="10" rx="2"></rect><rect x="19" y="10" width="1" height="4" ></rect><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline>
+	<symbol id="tabler-battery-2" class="icon tabler-icon tabler-icon-battery-2" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline>
 </symbol>
-	<symbol id="tabler-battery-3" class="icon tabler-icon tabler-icon-battery-3" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="7" width="15" height="10" rx="2"></rect><rect x="19" y="10" width="1" height="4" ></rect><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline><polyline points="13 10 13 14"></polyline>
+	<symbol id="tabler-battery-3" class="icon tabler-icon tabler-icon-battery-3" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline><polyline points="13 10 13 14"></polyline>
 </symbol>
-	<symbol id="tabler-battery-4" class="icon tabler-icon tabler-icon-battery-4" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="7" width="15" height="10" rx="2"></rect><rect x="19" y="10" width="1" height="4" ></rect><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline><polyline points="13 10 13 14"></polyline><polyline points="16 10 16 14"></polyline>
+	<symbol id="tabler-battery-4" class="icon tabler-icon tabler-icon-battery-4" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path><polyline points="7 10 7 14"></polyline><polyline points="10 10 10 14"></polyline><polyline points="13 10 13 14"></polyline><polyline points="16 10 16 14"></polyline>
 </symbol>
-	<symbol id="tabler-battery-charging" class="icon tabler-icon tabler-icon-battery-charging" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M7 7H6a2 2 0 00-2 2v6a2 2 0 002 2h2m7-10h2a2 2 0 012 2v6a2 2 0 01-2 2h-1" /><rect x="19" y="10" width="1" height="4" ></rect><polyline points="11 8 10 12 13 12 12 16"></polyline>
+	<symbol id="tabler-battery-charging" class="icon tabler-icon tabler-icon-battery-charging" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M15 7h2a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-1"/><path d="M7 7H6a2 2 0 00-2 2v6a2 2 0 002 2h2" /><polyline points="11 8 10 12 13 12 12 16"></polyline>
 </symbol>
-	<symbol id="tabler-battery-empty" class="icon tabler-icon tabler-icon-battery-empty" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="7" width="15" height="10" rx="2"></rect><rect x="19" y="10" width="1" height="4" ></rect>
+	<symbol id="tabler-battery" class="icon tabler-icon tabler-icon-battery" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M6 7h11a2 2 0 012 2v.5a.5 .5 0 00.5 .5a.5 .5 0 01.5 .5v3a.5 .5 0 01-.5 .5a.5 .5 0 00-.5 .5v.5a2 2 0 01-2 2h-11a2 2 0 01-2 -2v-6a2 2 0 012 -2"></path>
 </symbol>
 	<symbol id="tabler-bookmark" class="icon tabler-icon tabler-icon-bookmark" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M9 4h6a2 2 0 012 2v14l-5-3l-5 3v-14a2 2 0 012 -2"></path>
 </symbol>
@@ -277,7 +277,7 @@
 	<use xlink:href="#tabler-battery-3" x="726" y="78" width="24" height="24" />
 	<use xlink:href="#tabler-battery-4" x="780" y="78" width="24" height="24" />
 	<use xlink:href="#tabler-battery-charging" x="834" y="78" width="24" height="24" />
-	<use xlink:href="#tabler-battery-empty" x="24" y="132" width="24" height="24" />
+	<use xlink:href="#tabler-battery" x="24" y="132" width="24" height="24" />
 	<use xlink:href="#tabler-bookmark" x="78" y="132" width="24" height="24" />
 	<use xlink:href="#tabler-border-all" x="132" y="132" width="24" height="24" />
 	<use xlink:href="#tabler-border-bottom" x="186" y="132" width="24" height="24" />