Map Tools updates: icons in inventory, code cleanup.