Changed committed states to use icon instead of background colour.