Added icons, refined others.