more fixes for toolbar buttons