Finishing tests and beautify map icons