Fixes #933 Update markup and sass in TC2 to be in line with updates from master from #1047 glyphs to cssclass approach;