Fixing cucumber tests
Adding new tomato icons