Add support for badge and icon.