Improve circle battery

Fix text position and some cleaning from omni.

Change-Id: If36690fd0592cb5173f65ba348d6076619f0159c
Signed-off-by: kecinzer <kecinzer@gmail.com>