Fix icon class construction