Various bug fixes to icon spacing