Better Icon Markup and Layout Structure