prettier icons, and more uniform