diff --git a/app/src/lib/components/BatteryIndicator.svelte b/app/src/lib/components/BatteryIndicator.svelte
index b25f5a8..2ed4d0f 100644
--- a/app/src/lib/components/BatteryIndicator.svelte
+++ b/app/src/lib/components/BatteryIndicator.svelte
@@ -6,20 +6,20 @@
 	import Battery100 from '~icons/tabler/battery-4';
 	import BatteryCharging from '~icons/tabler/battery-charging-2';
 
-	export let charging = false;
-	export let soc = 100;
+	export let current = 0;
+	export let voltage = 0;
 </script>
 
-<div class="tooltip tooltip-bottom" data-tip="{soc} %">
-	{#if charging}
+<div class="tooltip tooltip-left z-10" data-tip="{voltage}V {Math.floor(current*10)/10} mA">
+	{#if voltage == 0}
 		<BatteryCharging class="{$$props.class || ''} -rotate-90 animate-pulse" />
-	{:else if soc > 75}
+	{:else if voltage > 8.2}
 		<Battery100 class="{$$props.class || ''} -rotate-90" />
-	{:else if soc > 55}
+	{:else if voltage > 8}
 		<Battery75 class="{$$props.class || ''} -rotate-90" />
-	{:else if soc > 30}
+	{:else if voltage > 7.8}
 		<Battery50 class="{$$props.class || ''} -rotate-90" />
-	{:else if soc > 5}
+	{:else if voltage > 7.6}
 		<Battery25 class="{$$props.class || ''} -rotate-90" />
 	{:else}
 		<Battery0 class="{$$props.class || ''} text-error -rotate-90 animate-pulse" />
diff --git a/app/src/lib/stores/telemetry.ts b/app/src/lib/stores/telemetry.ts
index 1cffd95..70a6475 100644
--- a/app/src/lib/stores/telemetry.ts
+++ b/app/src/lib/stores/telemetry.ts
@@ -6,8 +6,8 @@ let telemetry_data = {
 		rssi: 0
 	},
 	battery: {
-		soc: 100,
-		charging: false
+		voltage: 100,
+		current: false
 	},
 	download_ota: {
 		status: 'none',
@@ -30,7 +30,7 @@ function createTelemetry() {
 		setBattery: (data: Battery) => {
 			update((telemetry_data) => ({
 				...telemetry_data,
-				battery: { soc: data.soc, charging: data.charging }
+				battery: { voltage: data.voltage, current: data.current }
 			}));
 		},
 		setDownloadOTA: (data: DownloadOTA) => {
diff --git a/app/src/lib/types/models.ts b/app/src/lib/types/models.ts
index 8854635..37b9222 100644
--- a/app/src/lib/types/models.ts
+++ b/app/src/lib/types/models.ts
@@ -70,8 +70,8 @@ export type RSSI = {
 };
 
 export type Battery = {
-	soc: number;
-	charging: boolean;
+	voltage: number;
+	current: boolean;
 };
 
 export type DownloadOTA = {
diff --git a/app/src/routes/statusbar.svelte b/app/src/routes/statusbar.svelte
index b13ca17..df03418 100644
--- a/app/src/routes/statusbar.svelte
+++ b/app/src/routes/statusbar.svelte
@@ -61,8 +61,8 @@
 	{#if $page.data.features.battery}
 		<div class="flex-none">
 			<BatteryIndicator
-				charging={$telemetry.battery.charging}
-				soc={$telemetry.battery.soc}
+				voltage={$telemetry.battery.voltage}
+				current={$telemetry.battery.current}
 				class="h-7 w-7"
 			/>
 		</div>