Add new icon types. Modify sligthly user spec