updated the icon set and organized the icon locations