Lots of icon cleanup and new icons.