Small amends and a better icons package