Change a few icon names

This will make it easier to swap in icons of different colors.