Fix icon and label