custom toolbar items impl.
Merge branch 'custom-items'