fixes #6473

## /!\ PR against 2.x /!\##

Should just fix #6473, re-show all the toolbar when rebuilding.


I did not backport 3.0 fixes as the changes are too huge, have refactor and add functionalities.