Added icons; improved others.