Bugfix for toolbar buttons
Merge branch 'hotfix/1.1.1'