Fix spacing for battery icon percentage & JB style

Change-Id: I19babb7d89c40e822152e296a9eb3a4fae16eb96