label and icon fix