Added more icons; refined others.