Add support for Battery Icon & Percentage option and fix issues with battery icon