Pairing with Glyphicons
Closes #1806
Fixes #1256
Fixes #1257