diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c
index 48157d3e14..cf7cd61f83 100644
--- a/gtk/gtkpicture.c
+++ b/gtk/gtkpicture.c
@@ -178,7 +178,8 @@ gtk_picture_measure (GtkWidget      *widget,
   double min_width, min_height, nat_width, nat_height;
   double default_size;
 
-  if (self->paintable == NULL)
+  /* for_size = 0 below is treated as -1, but we want to return zeros. */
+  if (self->paintable == NULL || for_size == 0)
     {
       *minimum = 0;
       *natural = 0;
diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.css b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.css
new file mode 100644
index 0000000000..e496fc2d82
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100px 100px;
+}
diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ref.ui b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ref.ui
new file mode 100644
index 0000000000..9521d560cb
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui
new file mode 100644
index 0000000000..5826455256
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-100x200-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-100x100.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-100x100-picture-in-100x200.ui b/testsuite/reftests/center-center-100x100-picture-in-100x200.ui
index 5826455256..2acb5704ba 100644
--- a/testsuite/reftests/center-center-100x100-picture-in-100x200.ui
+++ b/testsuite/reftests/center-center-100x100-picture-in-100x200.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">200</property>
+    <property name="default-width">100</property>
+    <property name="default-height">200</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-100x100.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-100x100.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.css b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.css
new file mode 100644
index 0000000000..e496fc2d82
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100px 100px;
+}
diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ref.ui b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ref.ui
new file mode 100644
index 0000000000..e06f2b02dd
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui
new file mode 100644
index 0000000000..06a17662a3
--- /dev/null
+++ b/testsuite/reftests/center-center-100x100-picture-in-200x100-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-100x100.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-100x100-picture-in-200x100.ui b/testsuite/reftests/center-center-100x100-picture-in-200x100.ui
index 06a17662a3..c5bc7b0882 100644
--- a/testsuite/reftests/center-center-100x100-picture-in-200x100.ui
+++ b/testsuite/reftests/center-center-100x100-picture-in-200x100.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">200</property>
-    <property name="height_request">100</property>
+    <property name="default-width">200</property>
+    <property name="default-height">100</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-100x100.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-100x100.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.css b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.css
new file mode 100644
index 0000000000..e496fc2d82
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100px 100px;
+}
diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ref.ui b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ref.ui
new file mode 100644
index 0000000000..9521d560cb
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui
new file mode 100644
index 0000000000..9f02233bbd
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-100x200-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-150x150.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200.css b/testsuite/reftests/center-center-150x150-picture-in-100x200.css
index adbc2cbedc..e496fc2d82 100644
--- a/testsuite/reftests/center-center-150x150-picture-in-100x200.css
+++ b/testsuite/reftests/center-center-150x150-picture-in-100x200.css
@@ -11,5 +11,5 @@ picture {
   background-image: image(lime);
   background-repeat: no-repeat;
   background-position: center;
-  background-size: 150px 150px;
+  background-size: 100px 100px;
 }
diff --git a/testsuite/reftests/center-center-150x150-picture-in-100x200.ui b/testsuite/reftests/center-center-150x150-picture-in-100x200.ui
index 9f02233bbd..d7f8295550 100644
--- a/testsuite/reftests/center-center-150x150-picture-in-100x200.ui
+++ b/testsuite/reftests/center-center-150x150-picture-in-100x200.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">200</property>
+    <property name="default-width">100</property>
+    <property name="default-height">200</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-150x150.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-150x150.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.css b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.css
new file mode 100644
index 0000000000..adbc2cbedc
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 150px 150px;
+}
diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ref.ui b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ref.ui
new file mode 100644
index 0000000000..e06f2b02dd
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui
new file mode 100644
index 0000000000..1213e9249e
--- /dev/null
+++ b/testsuite/reftests/center-center-150x150-picture-in-200x100-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-150x150.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-150x150-picture-in-200x100.ui b/testsuite/reftests/center-center-150x150-picture-in-200x100.ui
index 1213e9249e..3c74776bd3 100644
--- a/testsuite/reftests/center-center-150x150-picture-in-200x100.ui
+++ b/testsuite/reftests/center-center-150x150-picture-in-200x100.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">200</property>
-    <property name="height_request">100</property>
+    <property name="default-width">200</property>
+    <property name="default-height">100</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-150x150.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-150x150.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.css b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.css
new file mode 100644
index 0000000000..e496fc2d82
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100px 100px;
+}
diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ref.ui b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ref.ui
new file mode 100644
index 0000000000..9521d560cb
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui
new file mode 100644
index 0000000000..f15b48b5d5
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-100x200-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-200x200.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200.css b/testsuite/reftests/center-center-200x200-picture-in-100x200.css
index cb3b17ba09..e496fc2d82 100644
--- a/testsuite/reftests/center-center-200x200-picture-in-100x200.css
+++ b/testsuite/reftests/center-center-200x200-picture-in-100x200.css
@@ -11,5 +11,5 @@ picture {
   background-image: image(lime);
   background-repeat: no-repeat;
   background-position: center;
-  background-size: 200px 200px;
+  background-size: 100px 100px;
 }
diff --git a/testsuite/reftests/center-center-200x200-picture-in-100x200.ui b/testsuite/reftests/center-center-200x200-picture-in-100x200.ui
index f15b48b5d5..0f4ead1f86 100644
--- a/testsuite/reftests/center-center-200x200-picture-in-100x200.ui
+++ b/testsuite/reftests/center-center-200x200-picture-in-100x200.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">200</property>
+    <property name="default-width">100</property>
+    <property name="default-height">200</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-200x200.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-200x200.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.css b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.css
new file mode 100644
index 0000000000..cb3b17ba09
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 200px 200px;
+}
diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ref.ui b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ref.ui
new file mode 100644
index 0000000000..e06f2b02dd
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui
new file mode 100644
index 0000000000..6e787008fa
--- /dev/null
+++ b/testsuite/reftests/center-center-200x200-picture-in-200x100-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-200x200.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-200x200-picture-in-200x100.ui b/testsuite/reftests/center-center-200x200-picture-in-200x100.ui
index 6e787008fa..82b7b89f4e 100644
--- a/testsuite/reftests/center-center-200x200-picture-in-200x100.ui
+++ b/testsuite/reftests/center-center-200x200-picture-in-200x100.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">200</property>
-    <property name="height_request">100</property>
+    <property name="default-width">200</property>
+    <property name="default-height">100</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-200x200.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-200x200.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.css b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.css
new file mode 100644
index 0000000000..2756ae7d64
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 20px 20px;
+}
diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ref.ui b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ref.ui
new file mode 100644
index 0000000000..9521d560cb
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui
new file mode 100644
index 0000000000..55177f2749
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-100x200-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-20x20.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-100x200.ui b/testsuite/reftests/center-center-20x20-picture-in-100x200.ui
index 55177f2749..80ecb6f2f1 100644
--- a/testsuite/reftests/center-center-20x20-picture-in-100x200.ui
+++ b/testsuite/reftests/center-center-20x20-picture-in-100x200.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">200</property>
+    <property name="default-width">100</property>
+    <property name="default-height">200</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-20x20.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-20x20.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.css b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.css
new file mode 100644
index 0000000000..2756ae7d64
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 20px 20px;
+}
diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ref.ui b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ref.ui
new file mode 100644
index 0000000000..e06f2b02dd
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui
new file mode 100644
index 0000000000..e5835423fb
--- /dev/null
+++ b/testsuite/reftests/center-center-20x20-picture-in-200x100-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-20x20.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-20x20-picture-in-200x100.ui b/testsuite/reftests/center-center-20x20-picture-in-200x100.ui
index e5835423fb..239c680026 100644
--- a/testsuite/reftests/center-center-20x20-picture-in-200x100.ui
+++ b/testsuite/reftests/center-center-20x20-picture-in-200x100.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">200</property>
-    <property name="height_request">100</property>
+    <property name="default-width">200</property>
+    <property name="default-height">100</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-20x20.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-20x20.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.css b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.css
new file mode 100644
index 0000000000..e496fc2d82
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100px 100px;
+}
diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ref.ui b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ref.ui
new file mode 100644
index 0000000000..9521d560cb
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui
new file mode 100644
index 0000000000..2fff2c91d3
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-100x200-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">200</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-300x300.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200.css b/testsuite/reftests/center-center-300x300-picture-in-100x200.css
index 5b067dd562..e496fc2d82 100644
--- a/testsuite/reftests/center-center-300x300-picture-in-100x200.css
+++ b/testsuite/reftests/center-center-300x300-picture-in-100x200.css
@@ -11,5 +11,5 @@ picture {
   background-image: image(lime);
   background-repeat: no-repeat;
   background-position: center;
-  background-size: 300px 300px;
+  background-size: 100px 100px;
 }
diff --git a/testsuite/reftests/center-center-300x300-picture-in-100x200.ui b/testsuite/reftests/center-center-300x300-picture-in-100x200.ui
index 2fff2c91d3..12b254670f 100644
--- a/testsuite/reftests/center-center-300x300-picture-in-100x200.ui
+++ b/testsuite/reftests/center-center-300x300-picture-in-100x200.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">100</property>
-    <property name="height_request">200</property>
+    <property name="default-width">100</property>
+    <property name="default-height">200</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-300x300.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-300x300.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.css b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.css
new file mode 100644
index 0000000000..5b067dd562
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.css
@@ -0,0 +1,15 @@
+* {
+  all: unset;
+  background-color: mintcream;
+}
+
+picture {
+  background-color: firebrick;
+}
+
+#reference {
+  background-image: image(lime);
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 300px 300px;
+}
diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ref.ui b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ref.ui
new file mode 100644
index 0000000000..e06f2b02dd
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ref.ui
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="name">reference</property>
+    <property name="decorated">0</property>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui
new file mode 100644
index 0000000000..5c2e1735e6
--- /dev/null
+++ b/testsuite/reftests/center-center-300x300-picture-in-200x100-overlay.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="width_request">200</property>
+    <property name="height_request">100</property>
+    <property name="decorated">0</property>
+    <child>
+      <object class="GtkOverlay">
+        <child type="overlay">
+          <object class="GtkPicture">
+            <property name="paintable">green-300x300.png</property>
+            <property name="keep-aspect-ratio">0</property>
+            <property name="can-shrink">1</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <layout>
+              <property name="measure">0</property>
+            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/center-center-300x300-picture-in-200x100.ui b/testsuite/reftests/center-center-300x300-picture-in-200x100.ui
index 5c2e1735e6..4182b9d821 100644
--- a/testsuite/reftests/center-center-300x300-picture-in-200x100.ui
+++ b/testsuite/reftests/center-center-300x300-picture-in-200x100.ui
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="width_request">200</property>
-    <property name="height_request">100</property>
+    <property name="default-width">200</property>
+    <property name="default-height">100</property>
     <property name="decorated">0</property>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkPicture">
-            <property name="paintable">green-300x300.png</property>
-            <property name="keep-aspect-ratio">0</property>
-            <property name="can-shrink">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="measure">0</property>
-            </layout>
-          </object>
-        </child>
+      <object class="GtkPicture">
+        <property name="paintable">green-300x300.png</property>
+        <property name="keep-aspect-ratio">0</property>
+        <property name="can-shrink">1</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 0239f43df3..587fa252ac 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -173,35 +173,65 @@ testdata = [
   'button-wrapping.ui',
   'button-wrapping.ref.ui',
   'center-center-100x100-picture-in-100x200.css',
+  'center-center-100x100-picture-in-100x200-overlay.css',
   'center-center-100x100-picture-in-100x200.ref.ui',
+  'center-center-100x100-picture-in-100x200-overlay.ref.ui',
   'center-center-100x100-picture-in-100x200.ui',
+  'center-center-100x100-picture-in-100x200-overlay.ui',
   'center-center-100x100-picture-in-200x100.css',
+  'center-center-100x100-picture-in-200x100-overlay.css',
   'center-center-100x100-picture-in-200x100.ref.ui',
+  'center-center-100x100-picture-in-200x100-overlay.ref.ui',
   'center-center-100x100-picture-in-200x100.ui',
+  'center-center-100x100-picture-in-200x100-overlay.ui',
   'center-center-150x150-picture-in-100x200.css',
+  'center-center-150x150-picture-in-100x200-overlay.css',
   'center-center-150x150-picture-in-100x200.ref.ui',
+  'center-center-150x150-picture-in-100x200-overlay.ref.ui',
   'center-center-150x150-picture-in-100x200.ui',
+  'center-center-150x150-picture-in-100x200-overlay.ui',
   'center-center-150x150-picture-in-200x100.css',
+  'center-center-150x150-picture-in-200x100-overlay.css',
   'center-center-150x150-picture-in-200x100.ref.ui',
+  'center-center-150x150-picture-in-200x100-overlay.ref.ui',
   'center-center-150x150-picture-in-200x100.ui',
+  'center-center-150x150-picture-in-200x100-overlay.ui',
   'center-center-200x200-picture-in-100x200.css',
+  'center-center-200x200-picture-in-100x200-overlay.css',
   'center-center-200x200-picture-in-100x200.ref.ui',
+  'center-center-200x200-picture-in-100x200-overlay.ref.ui',
   'center-center-200x200-picture-in-100x200.ui',
+  'center-center-200x200-picture-in-100x200-overlay.ui',
   'center-center-200x200-picture-in-200x100.css',
+  'center-center-200x200-picture-in-200x100-overlay.css',
   'center-center-200x200-picture-in-200x100.ref.ui',
+  'center-center-200x200-picture-in-200x100-overlay.ref.ui',
   'center-center-200x200-picture-in-200x100.ui',
+  'center-center-200x200-picture-in-200x100-overlay.ui',
   'center-center-20x20-picture-in-100x200.css',
+  'center-center-20x20-picture-in-100x200-overlay.css',
   'center-center-20x20-picture-in-100x200.ref.ui',
+  'center-center-20x20-picture-in-100x200-overlay.ref.ui',
   'center-center-20x20-picture-in-100x200.ui',
+  'center-center-20x20-picture-in-100x200-overlay.ui',
   'center-center-20x20-picture-in-200x100.css',
+  'center-center-20x20-picture-in-200x100-overlay.css',
   'center-center-20x20-picture-in-200x100.ref.ui',
+  'center-center-20x20-picture-in-200x100-overlay.ref.ui',
   'center-center-20x20-picture-in-200x100.ui',
+  'center-center-20x20-picture-in-200x100-overlay.ui',
   'center-center-300x300-picture-in-100x200.css',
+  'center-center-300x300-picture-in-100x200-overlay.css',
   'center-center-300x300-picture-in-100x200.ref.ui',
+  'center-center-300x300-picture-in-100x200-overlay.ref.ui',
   'center-center-300x300-picture-in-100x200.ui',
+  'center-center-300x300-picture-in-100x200-overlay.ui',
   'center-center-300x300-picture-in-200x100.css',
+  'center-center-300x300-picture-in-200x100-overlay.css',
   'center-center-300x300-picture-in-200x100.ref.ui',
+  'center-center-300x300-picture-in-200x100-overlay.ref.ui',
   'center-center-300x300-picture-in-200x100.ui',
+  'center-center-300x300-picture-in-200x100-overlay.ui',
   'centerlayout-invisible-child.css',
   'centerlayout-invisible-child.ref.ui',
   'centerlayout-invisible-child.ui',