cursor fix (#2358) and svg fix (#2377)