redesigned battery data structures and added icon merge