Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.