Improves markup for button icons