diff --git a/tests/figs/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg b/tests/figs/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
index e8e61da7ec..1965e13fa8 100644
--- a/tests/figs/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
+++ b/tests/figs/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
@@ -51,7 +51,7 @@
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='352.81' y='568.24' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(13.04,286.70) rotate(-90)' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text></g>
 <rect x='686.87' y='233.09' width='27.65' height='101.72' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='686.87' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABjUlEQVRYhc2Yy3EdMRADG9SUHZsjcVzKyZH4YFtLcqDDcwaDgzaArh6Any3qnHcz/Oz+Udr/phwsEwGVobQ/xiCA4pkbYVEkjCSKQEa4QyCcygiKE8jIhEaTQqPRFPvvnCNCIJtyACSJ8vNnDLpAsX+PQQiqEyBDeX9PCFF9vs2NJMq75hxDdQBkoPq8zY1erc1BWJQDILGo3msutKD6zEFqZUDYVD9z0JIoB4xOm+pHY5AUau2V0Z4bLd4yoF5kWjOmzk2AoPYNnUe3A61JISOJOgGjtqlz5+eRbep0ACSoHTASZDKSO5PRWitj5A7VbzsTNsuhsFvUjuz+kJFXakG2qOPALXKhdo85rxPyBEA4ZCSFjNbLaB62ZeqM3yGA/moZdao1BLUDGanJhL1IjbZSo53Upk2FTUM9KaPDnZNY1FnPnGNRlwAIqKMAaHXKSNQNGBkyRq+blv11jBpTxwEjieqA0f+f0bmRENV9xiCWqJvI6Jg6dw7Cop4OLEhBfXTgzd+itvfPMYn96xMzVA/gKz5U8AAAAABJRU5ErkJggg=='/></g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='686.87' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABjUlEQVRYhc2YwZUVMQwEq716EBuRENfmRCQcgB3b6j18MlAfdgKoV2rJ8jzrnHcz/Oz+Udr/phwsEwGVobQ/xiCA4pkbYVEkjCSKQEa4QyCcygiKE8jIhEqTQqXRFPvvnCNCIJtyACSJ8vNnDLpAsX+PQQiqEyBDeX9PCFF9vs2NJMq75hxDdQBkoPq8zY1eXZuDsCgHQGJRvddcaEH1mYPUyoCwqX7moCVRDhidNtWPxiAp1LVXRntutHjLgHqR6ZoxdW4CBLVvaB/dDnRNChlJ1AkYtU2dO99HtqnTAZCgdsBIkMlI7kxGa62MkTvUftuZsFkOhd2iduT0h4y8UgPZoo4Dt8iF2j3mvDbkCYBwyEgKGa2X0Txsy9QZv0MA/dUyakPtRGmkSjOZsBchI1YoI53UoVWqa6mBbEFt7pzEos565hyLugRAQB0FQKtTRqJuwMiQMXrdtOyvY9SYOg4YSVQHjP7/jM6NhKjuMwaxRN1ERsfUuXMQFvV0YCAF9dGBN3+L2t4/xyT2r08udw/fYGKV5AAAAABJRU5ErkJggg=='/></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='709.63' y='337.69' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='709.63' y='323.34' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='709.63' y='308.99' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text></g>
diff --git a/tests/figs/guides/white-to-red-gradient-colorbar-thick-black-tick-marks-green-frame.svg b/tests/figs/guides/white-to-red-gradient-colorbar-thick-black-tick-marks-green-frame.svg
index b7e852bba4..5ba8cfc8d6 100644
--- a/tests/figs/guides/white-to-red-gradient-colorbar-thick-black-tick-marks-green-frame.svg
+++ b/tests/figs/guides/white-to-red-gradient-colorbar-thick-black-tick-marks-green-frame.svg
@@ -51,7 +51,7 @@
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='349.15' y='568.24' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(13.04,286.70) rotate(-90)' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text></g>
 <rect x='679.54' y='233.09' width='34.98' height='101.72' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='679.54' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABE0lEQVRYhc2YwRHDMAgEF4Q9frmvVJKGUw/k4RK8D7kAzbHHCeSYM4a3X8ynuOv1OcRQXOf7g4DiEhTNUJxWaceSFB2WohIUhaVohmIJihiKSuGcoCijtKBYhiLLNQ32YLmGxCiSYhkRsVzL7WB7rlmMsBjFUOROjAaKNDq7d4tIW6VlWPanpOix35priv0ao7AYjcQIjZEV2gzpGsFyjZYYdUqlaYy0zm4r/YlVmtWQbcHe9KpVsmYdpDEa7RppqzTLNawBibVEPOkXFKU1IMPaalvrbG0ZtWCPC9uw39pGQGIUlmvjbiPaFNGeWTuN7LAuf22KeLC1XxrWcz2srGnvNSzX2gptWqHF6qN+7P8Kgn5/vNJD8shvDpsAAAAASUVORK5CYII='/></g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='679.54' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABGklEQVRYhc3Yy3XDUAgE0AFhJ6v0lUrScOp5eOESdBdWAZxhPsBT7bM2d7/a38nP3K6T2ky+n/cLJZl8AURZVKg2k8cFAG0mD4VoAKJSiHYzufp+oSSTC7SWUqo1QvTmSLTGCgX5KEHyV2dyiYgUQtSK7FUcbSGOUpm0UI3OI4GIcbRRHB0aEUD2qUwaFOpCiKqV/GqLvOUXrTGOVGjdOmIcKdVacZTNpMU6Uuk/LUP7Uc4+Kv39cYY8ypCtDNmK7LCDXanG1tGqiOSo1qxq4oZU95EbbKvSrxbkYc5mx2ijMbL0CSEM2eoJEXr6iUKrBhubR6VC6+5stY6sap9FNvulwUZt1Dxi6VeqHRXaVqGN8tF5y/8HAP2/AM7iPvzuGKsSAAAAAElFTkSuQmCC'/></g>
 <rect x='679.54' y='248.41' width='17.28' height='86.40' style='stroke-width: 1.12; stroke: #00FF00;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='702.30' y='337.69' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='12.22px' lengthAdjust='spacingAndGlyphs'>0.0</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='702.30' y='316.16' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='12.22px' lengthAdjust='spacingAndGlyphs'>0.5</text></g>
diff --git a/tests/figs/guides/white-to-red-gradient-colorbar-white-tick-marks-no-frame.svg b/tests/figs/guides/white-to-red-gradient-colorbar-white-tick-marks-no-frame.svg
index cb60f013aa..7b25664f0b 100644
--- a/tests/figs/guides/white-to-red-gradient-colorbar-white-tick-marks-no-frame.svg
+++ b/tests/figs/guides/white-to-red-gradient-colorbar-white-tick-marks-no-frame.svg
@@ -51,7 +51,7 @@
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='349.15' y='568.24' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(13.04,286.70) rotate(-90)' style='font-size: 11.00px; font-family: Liberation Sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text></g>
 <rect x='679.54' y='233.09' width='34.98' height='101.72' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='679.54' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABE0lEQVRYhc2YwRHDMAgEF4Q9frmvVJKGUw/k4RK8D7kAzbHHCeSYM4a3X8ynuOv1OcRQXOf7g4DiEhTNUJxWaceSFB2WohIUhaVohmIJihiKSuGcoCijtKBYhiLLNQ32YLmGxCiSYhkRsVzL7WB7rlmMsBjFUOROjAaKNDq7d4tIW6VlWPanpOix35priv0ao7AYjcQIjZEV2gzpGsFyjZYYdUqlaYy0zm4r/YlVmtWQbcHe9KpVsmYdpDEa7RppqzTLNawBibVEPOkXFKU1IMPaalvrbG0ZtWCPC9uw39pGQGIUlmvjbiPaFNGeWTuN7LAuf22KeLC1XxrWcz2srGnvNSzX2gptWqHF6qN+7P8Kgn5/vNJD8shvDpsAAAAASUVORK5CYII='/></g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><image width='17.28' height='86.40' x='679.54' y='248.41' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAABXCAYAAAAJWxWIAAAABmJLR0QA/wD/AP+gvaeTAAABGklEQVRYhc3Yy3XDUAgE0AFhJ6v0lUrScOp5eOESdBdWAZxhPsBT7bM2d7/a38nP3K6T2ky+n/cLJZl8AURZVKg2k8cFAG0mD4VoAKJSiHYzufp+oSSTC7SWUqo1QvTmSLTGCgX5KEHyV2dyiYgUQtSK7FUcbSGOUpm0UI3OI4GIcbRRHB0aEUD2qUwaFOpCiKqV/GqLvOUXrTGOVGjdOmIcKdVacZTNpMU6Uuk/LUP7Uc4+Kv39cYY8ypCtDNmK7LCDXanG1tGqiOSo1qxq4oZU95EbbKvSrxbkYc5mx2ijMbL0CSEM2eoJEXr6iUKrBhubR6VC6+5stY6sap9FNvulwUZt1Dxi6VeqHRXaVqGN8tF5y/8HAP2/AM7iPvzuGKsSAAAAAElFTkSuQmCC'/></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='702.30' y='337.69' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='12.22px' lengthAdjust='spacingAndGlyphs'>0.0</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='702.30' y='316.16' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='12.22px' lengthAdjust='spacingAndGlyphs'>0.5</text></g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='702.30' y='294.64' style='font-size: 8.80px; font-family: Liberation Sans;' textLength='12.22px' lengthAdjust='spacingAndGlyphs'>1.0</text></g>