Fix broken spec, and fix icons.