Further fixes for bootstrap/angular templates.
Icon fixes.