defs and icon fix