@jimmac, commit 7395160e was made for current Adwaita, it doesnt work for Adwaita refresh. I've made adjustments in this MR, based on wip/jimmac/adwaita-3-32 branch (before commit 7395160e).
Before:
After:
