Added icons; revised others.