New map tool icons and optimizations.