Merge "[Battery] New icon updates" into main