Revert "Fix toolbar bug"

This reverts commit 91fb75bcd9081c6f691bdc55d7dd2707debaf746.
Allow user customisation of the toolbar