Fix glyphicon after merge