Change some attribute icons and fix behat scenario