Fixed up some styling on button icons with a helper and CSS