Move toolbar related code to navigation

Closes #3507711

Merge request reports

Loading