diff --git a/testsuite/reftests/iconview-empty.css b/testsuite/reftests/iconview-empty.css
index ef7aa5088e..eedb85c4e5 100644
--- a/testsuite/reftests/iconview-empty.css
+++ b/testsuite/reftests/iconview-empty.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-iconview, image {
+iconview, picture {
   background-color: blue;
 }
diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index 78e8798fd3..9e0c3c580b 100644
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -11,7 +11,7 @@
         <property name="row_spacing">5</property>
         <property name="column_spacing">5</property>
         <child>
-          <object class="GtkImage" id="image-0-0">
+          <object class="GtkPicture" id="picture-0-0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
@@ -27,7 +27,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-1-0">
+          <object class="GtkPicture" id="picture-1-0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
@@ -43,7 +43,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-2-0">
+          <object class="GtkPicture" id="picture-2-0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
@@ -59,12 +59,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-3-0">
+          <object class="GtkPicture" id="picture-3-0">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
           </object>
@@ -76,12 +75,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-0-1">
+          <object class="GtkPicture" id="picture-0-1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
           </object>
@@ -93,12 +91,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-1-1">
+          <object class="GtkPicture" id="picture-1-1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
           </object>
@@ -110,12 +107,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-2-1">
+          <object class="GtkPicture" id="picture-2-1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
           </object>
@@ -127,12 +123,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-3-1">
+          <object class="GtkPicture" id="picture-3-1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">0</property>
             <property name="height-request">0</property>
           </object>
@@ -144,12 +139,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-0-2">
+          <object class="GtkPicture" id="picture-0-2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -161,12 +155,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-1-2">
+          <object class="GtkPicture" id="picture-1-2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -178,12 +171,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-2-2">
+          <object class="GtkPicture" id="picture-2-2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -195,12 +187,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-3-2">
+          <object class="GtkPicture" id="picture-3-2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -212,12 +203,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-0-3">
+          <object class="GtkPicture" id="picture-0-3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -229,12 +219,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-1-3">
+          <object class="GtkPicture" id="picture-1-3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -246,12 +235,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-2-3">
+          <object class="GtkPicture" id="picture-2-3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>
@@ -263,12 +251,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="image-3-3">
+          <object class="GtkPicture" id="picture-3-3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="icon-size">0</property>
             <property name="width-request">10</property>
             <property name="height-request">10</property>
           </object>