Misc icon fixes
Reduce margins a bit