Simplify map icon handling