Added better button images for maps
Merged upstream