diff --git a/test/reference/bug-source-cu.rgb24.ref.png b/test/reference/bug-source-cu.rgb24.ref.png
index 6cf2b1a31..9f2f52ce7 100644
Binary files a/test/reference/bug-source-cu.rgb24.ref.png and b/test/reference/bug-source-cu.rgb24.ref.png differ
diff --git a/test/reference/clip-stroke-unbounded.argb32.ref.png b/test/reference/clip-stroke-unbounded.argb32.ref.png
index 8bf64c108..316cc3618 100644
Binary files a/test/reference/clip-stroke-unbounded.argb32.ref.png and b/test/reference/clip-stroke-unbounded.argb32.ref.png differ
diff --git a/test/reference/clip-stroke-unbounded.rgb24.ref.png b/test/reference/clip-stroke-unbounded.rgb24.ref.png
index 2dbe36b31..ee4bec474 100644
Binary files a/test/reference/clip-stroke-unbounded.rgb24.ref.png and b/test/reference/clip-stroke-unbounded.rgb24.ref.png differ
diff --git a/test/reference/mask.argb32.ref.png b/test/reference/mask.argb32.ref.png
index d965468ff..2d740d41b 100644
Binary files a/test/reference/mask.argb32.ref.png and b/test/reference/mask.argb32.ref.png differ
diff --git a/test/reference/mask.rgb24.ref.png b/test/reference/mask.rgb24.ref.png
index 0617ec25b..12114a7e0 100644
Binary files a/test/reference/mask.rgb24.ref.png and b/test/reference/mask.rgb24.ref.png differ
diff --git a/test/reference/record-paint-alpha-clip-mask.argb32.ref.png b/test/reference/record-paint-alpha-clip-mask.argb32.ref.png
deleted file mode 100644
index 50546727a..000000000
Binary files a/test/reference/record-paint-alpha-clip-mask.argb32.ref.png and /dev/null differ
diff --git a/test/reference/record-paint-alpha-clip-mask.ref.png b/test/reference/record-paint-alpha-clip-mask.ref.png
index 3bc8cd5d5..34d3aa6d3 100644
Binary files a/test/reference/record-paint-alpha-clip-mask.ref.png and b/test/reference/record-paint-alpha-clip-mask.ref.png differ
diff --git a/test/reference/record-paint-alpha-clip-mask.rgb24.ref.png b/test/reference/record-paint-alpha-clip-mask.rgb24.ref.png
deleted file mode 100644
index 50546727a..000000000
Binary files a/test/reference/record-paint-alpha-clip-mask.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/record-text-transform.argb32.ref.png b/test/reference/record-text-transform.argb32.ref.png
deleted file mode 100644
index 4603bc528..000000000
Binary files a/test/reference/record-text-transform.argb32.ref.png and /dev/null differ
diff --git a/test/reference/record-text-transform.rgb24.ref.png b/test/reference/record-text-transform.rgb24.ref.png
deleted file mode 100644
index 4603bc528..000000000
Binary files a/test/reference/record-text-transform.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/record1414x-text-transform.ref.png b/test/reference/record1414x-text-transform.ref.png
index 5727f3559..ef3c96726 100644
Binary files a/test/reference/record1414x-text-transform.ref.png and b/test/reference/record1414x-text-transform.ref.png differ
diff --git a/test/reference/record2x-text-transform.ref.png b/test/reference/record2x-text-transform.ref.png
index 6c21785ef..ff521ab8a 100644
Binary files a/test/reference/record2x-text-transform.ref.png and b/test/reference/record2x-text-transform.ref.png differ
diff --git a/test/reference/record90-paint-alpha-clip-mask.argb32.ref.png b/test/reference/record90-paint-alpha-clip-mask.argb32.ref.png
deleted file mode 100644
index aa942524a..000000000
Binary files a/test/reference/record90-paint-alpha-clip-mask.argb32.ref.png and /dev/null differ
diff --git a/test/reference/record90-paint-alpha-clip-mask.ref.png b/test/reference/record90-paint-alpha-clip-mask.ref.png
new file mode 100644
index 000000000..03cf8056d
Binary files /dev/null and b/test/reference/record90-paint-alpha-clip-mask.ref.png differ
diff --git a/test/reference/record90-paint-alpha-clip-mask.rgb24.ref.png b/test/reference/record90-paint-alpha-clip-mask.rgb24.ref.png
deleted file mode 100644
index aa942524a..000000000
Binary files a/test/reference/record90-paint-alpha-clip-mask.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/record90-paint-alpha-clip.argb32.ref.png b/test/reference/record90-paint-alpha-clip.argb32.ref.png
deleted file mode 100644
index 15d1a3121..000000000
Binary files a/test/reference/record90-paint-alpha-clip.argb32.ref.png and /dev/null differ
diff --git a/test/reference/record90-paint-alpha-clip.ref.png b/test/reference/record90-paint-alpha-clip.ref.png
new file mode 100644
index 000000000..ab1fe3cf7
Binary files /dev/null and b/test/reference/record90-paint-alpha-clip.ref.png differ
diff --git a/test/reference/record90-paint-alpha-clip.rgb24.ref.png b/test/reference/record90-paint-alpha-clip.rgb24.ref.png
deleted file mode 100644
index 15d1a3121..000000000
Binary files a/test/reference/record90-paint-alpha-clip.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/record90-text-transform.argb32.ref.png b/test/reference/record90-text-transform.argb32.ref.png
deleted file mode 100644
index 22f6c1f0c..000000000
Binary files a/test/reference/record90-text-transform.argb32.ref.png and /dev/null differ
diff --git a/test/reference/record90-text-transform.ref.png b/test/reference/record90-text-transform.ref.png
new file mode 100644
index 000000000..e8fa7225f
Binary files /dev/null and b/test/reference/record90-text-transform.ref.png differ
diff --git a/test/reference/record90-text-transform.rgb24.ref.png b/test/reference/record90-text-transform.rgb24.ref.png
deleted file mode 100644
index 22f6c1f0c..000000000
Binary files a/test/reference/record90-text-transform.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/recording-surface-extend-none.argb32.ref.png b/test/reference/recording-surface-extend-none.argb32.ref.png
index c8040dabc..d69cdc906 100644
Binary files a/test/reference/recording-surface-extend-none.argb32.ref.png and b/test/reference/recording-surface-extend-none.argb32.ref.png differ
diff --git a/test/reference/recording-surface-extend-none.rgb24.ref.png b/test/reference/recording-surface-extend-none.rgb24.ref.png
index bd84338f2..48401f947 100644
Binary files a/test/reference/recording-surface-extend-none.rgb24.ref.png and b/test/reference/recording-surface-extend-none.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-extend-pad.argb32.ref.png b/test/reference/recording-surface-extend-pad.argb32.ref.png
index f1c3d23fb..31b700526 100644
Binary files a/test/reference/recording-surface-extend-pad.argb32.ref.png and b/test/reference/recording-surface-extend-pad.argb32.ref.png differ
diff --git a/test/reference/recording-surface-extend-pad.rgb24.ref.png b/test/reference/recording-surface-extend-pad.rgb24.ref.png
index 4906c8fdb..06a6ce2e9 100644
Binary files a/test/reference/recording-surface-extend-pad.rgb24.ref.png and b/test/reference/recording-surface-extend-pad.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-extend-reflect.argb32.ref.png b/test/reference/recording-surface-extend-reflect.argb32.ref.png
index 016bf391b..bc1d70fd7 100644
Binary files a/test/reference/recording-surface-extend-reflect.argb32.ref.png and b/test/reference/recording-surface-extend-reflect.argb32.ref.png differ
diff --git a/test/reference/recording-surface-extend-reflect.rgb24.ref.png b/test/reference/recording-surface-extend-reflect.rgb24.ref.png
index 59b58e90d..f6f52e7ac 100644
Binary files a/test/reference/recording-surface-extend-reflect.rgb24.ref.png and b/test/reference/recording-surface-extend-reflect.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-extend-repeat.argb32.ref.png b/test/reference/recording-surface-extend-repeat.argb32.ref.png
index 960bfd28a..d95245b5a 100644
Binary files a/test/reference/recording-surface-extend-repeat.argb32.ref.png and b/test/reference/recording-surface-extend-repeat.argb32.ref.png differ
diff --git a/test/reference/recording-surface-extend-repeat.rgb24.ref.png b/test/reference/recording-surface-extend-repeat.rgb24.ref.png
index d49fd12b9..2d775224e 100644
Binary files a/test/reference/recording-surface-extend-repeat.rgb24.ref.png and b/test/reference/recording-surface-extend-repeat.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-over.argb32.ref.png b/test/reference/recording-surface-over.argb32.ref.png
new file mode 100644
index 000000000..d69cdc906
Binary files /dev/null and b/test/reference/recording-surface-over.argb32.ref.png differ
diff --git a/test/reference/recording-surface-over.rgb24.ref.png b/test/reference/recording-surface-over.rgb24.ref.png
index bd84338f2..48401f947 100644
Binary files a/test/reference/recording-surface-over.rgb24.ref.png and b/test/reference/recording-surface-over.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-source.argb32.ref.png b/test/reference/recording-surface-source.argb32.ref.png
index 22c612bcc..bc6930f42 100644
Binary files a/test/reference/recording-surface-source.argb32.ref.png and b/test/reference/recording-surface-source.argb32.ref.png differ
diff --git a/test/reference/recording-surface-source.rgb24.ref.png b/test/reference/recording-surface-source.rgb24.ref.png
index 348167349..b77d6dca2 100644
Binary files a/test/reference/recording-surface-source.rgb24.ref.png and b/test/reference/recording-surface-source.rgb24.ref.png differ
diff --git a/test/reference/stroke-clipped.ref.png b/test/reference/stroke-clipped.ref.png
index 3240cfe51..2d4c5d123 100644
Binary files a/test/reference/stroke-clipped.ref.png and b/test/reference/stroke-clipped.ref.png differ