Fixed the icon changing bug by eliminating efficient reuse of them. Can always come back to it and make it more efficient, but for most purposes it should be stable.