WIP support for studios icons - code fixes