(hopefully) final icon-helper fix