Merge "Battery icon is too large"