TB3 - Allow usage of <span> for icons
Use a <span> for the icon
Remove static id attribute because Navbar can be used more than once in a page.
TB3 - update CSS class names