Added and renamed toolbar buttons
Merge with development