Handle other icon set classes, per #9