SSP-2255 - map toolbar layout changes