Merge "Use the same icon for battery"