Re-render the toolbar on changes - markdown icon fix and a little cleanup