Toolbar on xs screen fixes for issue #3464