new minimap and additional button icons
new icons and merge