Spacing and Icon Fixes