Adding in margin for icons, and rearranging icon placement in html