toolbar changes
fix for js
Fix icon
Base library options logic