map: settings and second icon set
merge new-map
use all available space for attributes; slimmer buttons
Merge branch 'master' into next