updates toolbar
Merge branch 'scott_dev'