Added icons; refined others.