Glyphicons new fix

Fixes #456
Fixes #594