References to Icon and IconRegister changed