diff --git a/test/assets/digits/0.png b/test/assets/digits/0.png
new file mode 100644
index 00000000000..ac3c4768edf
Binary files /dev/null and b/test/assets/digits/0.png differ
diff --git a/test/assets/digits/1.png b/test/assets/digits/1.png
new file mode 100644
index 00000000000..6768222729b
Binary files /dev/null and b/test/assets/digits/1.png differ
diff --git a/test/assets/digits/2.png b/test/assets/digits/2.png
new file mode 100644
index 00000000000..b1daa4735d8
Binary files /dev/null and b/test/assets/digits/2.png differ
diff --git a/test/assets/digits/3.png b/test/assets/digits/3.png
new file mode 100644
index 00000000000..6eca99b21bd
Binary files /dev/null and b/test/assets/digits/3.png differ
diff --git a/test/assets/digits/4.png b/test/assets/digits/4.png
new file mode 100644
index 00000000000..a721071e2cc
Binary files /dev/null and b/test/assets/digits/4.png differ
diff --git a/test/assets/digits/5.png b/test/assets/digits/5.png
new file mode 100644
index 00000000000..15cb19932a5
Binary files /dev/null and b/test/assets/digits/5.png differ
diff --git a/test/assets/digits/6.png b/test/assets/digits/6.png
new file mode 100644
index 00000000000..639f38439d9
Binary files /dev/null and b/test/assets/digits/6.png differ
diff --git a/test/assets/digits/7.png b/test/assets/digits/7.png
new file mode 100644
index 00000000000..5c1150b005a
Binary files /dev/null and b/test/assets/digits/7.png differ
diff --git a/test/assets/digits/8.png b/test/assets/digits/8.png
new file mode 100644
index 00000000000..abb8b48b0b1
Binary files /dev/null and b/test/assets/digits/8.png differ
diff --git a/test/assets/digits/9.png b/test/assets/digits/9.png
new file mode 100644
index 00000000000..6a40a21c6f5
Binary files /dev/null and b/test/assets/digits/9.png differ
diff --git a/test/assets/grid.html b/test/assets/grid.html
index e35d349b562..88edbb26d05 100644
--- a/test/assets/grid.html
+++ b/test/assets/grid.html
@@ -9,11 +9,18 @@ document.addEventListener('DOMContentLoaded', function() {
     }
 
     var palette = generatePalette(100);
-    for (var i = 0; i < 1000; ++i) {
+    for (var i = 0; i < 200; ++i) {
         var box = document.createElement('div');
         box.classList.add('box');
-        box.textContent = i;
         box.style.setProperty('background-color', palette[i % palette.length]);
+        var x = i;
+        do {
+            var digit = x % 10;
+            x = (x / 10)|0;
+            var img = document.createElement('img');
+            img.src = `./digits/${digit}.png`;
+            box.insertBefore(img, box.firstChild);
+        } while (x);
         document.body.appendChild(box);
     }
 });
@@ -33,7 +40,9 @@ body {
 
 .box {
     font-family: arial;
-    display: inline-block;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
     margin: 0;
     padding: 0;
     width: 50px;
diff --git a/test/golden/screenshot-clip-rect.png b/test/golden/screenshot-clip-rect.png
index f541bce8e00..ac23b7de502 100644
Binary files a/test/golden/screenshot-clip-rect.png and b/test/golden/screenshot-clip-rect.png differ
diff --git a/test/golden/screenshot-sanity.png b/test/golden/screenshot-sanity.png
index fabe5b85fca..ecab61fe179 100644
Binary files a/test/golden/screenshot-sanity.png and b/test/golden/screenshot-sanity.png differ