LPS-49704 Change glyphicons back to icons, edit layouttpls