added state support, icons

added state support, icons