If what you see is the same as Eshel, I will ask you the same question: shouldn't you apply face-remapping to the 2 new faces instead of the 'header-line' face from which they both inherit? What happens if you do define remapping for those two new faces?