Arrange toolbar icons, fix Chrome scrolling issue

[Fixes #55193576]