fix icons, fix map path drawing logic