fixing, replaced the icon,introduces enums for strings