fix #37621 and #32871

This is just a possible way to solve these problems. Other possibilities do exist.
I would add back the *editIcon* for the L-C-R Header/Footer so that the style of part of the text for each of them could be tuned independently.