Fixing Icon display bugs
Updates for Bootstrap 3 migration