diff --git a/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png b/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
index b5dd8e45e..0a8560245 100644
Binary files a/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png and b/tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
index 87fa8b772..766296a41 100644
Binary files a/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png and b/tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
index 94211f550..01aa299f5 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
index c94b14624..897602d53 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
index fd216a193..74245c9a0 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
index e2d1ca21f..1469d0d8f 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
index 76fe4cd85..95ccef4fa 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
index 86b452431..dd78ddb7a 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
index 29a472ed2..96f39fd87 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
index b8ba3913f..8d0883f79 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
index a889a930b..3497ebe59 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
index aac1ebf20..977c209f7 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-490-100-2.0-agg-reference.png
index fc12fec9c..1875a31fb 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-490-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-495-100-2.0-agg-reference.png
index adb3c6ec4..c02212ae4 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-495-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-497-100-2.0-agg-reference.png
index 31ae28f44..b5cba6d1e 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-497-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-498-100-2.0-agg-reference.png
index 7444522a6..d6791ffe0 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-498-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-499-100-2.0-agg-reference.png
index fe0cc79a5..dd54df143 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-499-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-500-100-2.0-agg-reference.png
index 881dad0e2..ac4cbe6cd 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-501-100-2.0-agg-reference.png
index 302ab7637..36a1e8db9 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-501-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-502-100-2.0-agg-reference.png
index 9fbc31e0c..2349a44f2 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-502-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-505-100-2.0-agg-reference.png
index 631f2e815..cb2134aa9 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-505-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-2-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-2-510-100-2.0-agg-reference.png
index ae758a265..bf86c6fe9 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-2-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-2-510-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
index b01387012..0e5b6c17f 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
index fe3171c33..1bf79c91c 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
index 05756c268..459261e2a 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
index 57dcb53a5..4e2c63581 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
index aa91d3210..8a00b0fc1 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
index 6bc1edae3..4de3e244c 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
index 2eecf4615..4c55c966b 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
index f1e95d555..17d5ec82a 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
index 2ad6d4558..baa551f68 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
index a88243906..26ef36305 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
index 55bdbf31e..6b8ad7256 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
index 99033a1cd..816431116 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
index 3b5064447..d6c3f5c1e 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
index 72e415068..860574af0 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
index 316390f2d..ba68e2399 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
index 51c7938ed..11031f402 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
index 84bb72d01..221ee2e52 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
index 43de3f11e..703584bdd 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
index 765ca1ed7..ea4f1cdfa 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png differ
diff --git a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
index 940b2f64b..fb7a29397 100644
Binary files a/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png and b/tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png differ