Icons and spacing tweaks