Merge branch 'new_toolbar_icons'