Further favicon template fixes