WIP major refactor of Icon behavior  to jive with the new texture goodness