Tweak icons and spacing