Fixes #456
merged conflicts
Merge pull request #598 from diowa/glyphicons-new-fix

Glyphicons new fix