Added and renamed toolbar buttons
Merge with development
Merge branch 'dev/j2/common' into dev/j2/free