Align templates between fez and espace (Cont)

[#62818578]