Fix up icons again