Correct map icon managment