diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index 7f837e92a4..5d5a0985ae 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -13,13 +13,13 @@
             </style>
             <child>
               <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
+                <property name="icon-name">go-previous-symbolic</property>
                 <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
+                <property name="icon-name">go-next-symbolic</property>
                 <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index 8997a5ac9e..340fecfdcb 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -10,12 +10,8 @@
           <object class="GtkButton" id="reset">
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
+            <property name="icon-name">view-refresh-symbolic</property>
             <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">view-refresh-symbolic</property>
-              </object>
-            </child>
           </object>
         </child>
       </object>
diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c
index dab3ccffa5..d19837563f 100644
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -18,8 +18,6 @@ do_headerbar (GtkWidget *do_widget)
   GtkWidget *header;
   GtkWidget *button;
   GtkWidget *box;
-  GtkWidget *image;
-  GIcon *icon;
 
   if (!window)
     {
@@ -32,20 +30,14 @@ do_headerbar (GtkWidget *do_widget)
 
       header = gtk_header_bar_new ();
 
-      button = gtk_button_new ();
-      icon = g_themed_icon_new ("mail-send-receive-symbolic");
-      image = gtk_image_new_from_gicon (icon);
-      g_object_unref (icon);
-      gtk_button_set_child (GTK_BUTTON (button), image);
+      button = gtk_button_new_from_icon_name ("mail-send-receive-symbolic");
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box, "linked");
-      button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      button = gtk_button_new_from_icon_name ("go-previous-symbolic");
       gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      button = gtk_button_new_from_icon_name ("go-next-symbolic");
       gtk_box_append (GTK_BOX (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
diff --git a/demos/gtk-demo/iconscroll.ui b/demos/gtk-demo/iconscroll.ui
index 95d2452747..be4c4219ed 100644
--- a/demos/gtk-demo/iconscroll.ui
+++ b/demos/gtk-demo/iconscroll.ui
@@ -13,13 +13,13 @@
             </style>
             <child>
               <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
+                <property name="icon-name">go-previous-symbolic</property>
                 <signal name="clicked" handler="iconscroll_prev_clicked_cb"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
+                <property name="icon-name">go-next-symbolic</property>
                 <signal name="clicked" handler="iconscroll_next_clicked_cb"/>
               </object>
             </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 485776c1ba..6800cffdd1 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -2606,12 +2606,12 @@ microphone-sensitivity-medium-symbolic</property>
                                     </style>
                                     <child>
                                       <object class="GtkButton">
-                                        <property name="icon-name">pan-start-symbolic</property>
+                                        <property name="icon-name">go-previous-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkButton">
-                                        <property name="icon-name">pan-end-symbolic</property>
+                                        <property name="icon-name">go-next-symbolic</property>
                                       </object>
                                     </child>
                                   </object>
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 16d16629bc..ebeb971794 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -439,7 +439,6 @@ change_header (GtkButton *button, gpointer data)
   GtkWidget *window = GTK_WIDGET (data);
   GtkWidget *label;
   GtkWidget *widget;
-  GtkWidget *image;
   GtkWidget *header;
 
   if (button && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
@@ -470,10 +469,8 @@ change_header (GtkButton *button, gpointer data)
 
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), widget);
 
-      widget= gtk_button_new ();
-      image = gtk_image_new_from_icon_name ("bookmark-new-symbolic");
+      widget= gtk_button_new_from_icon_name ("bookmark-new-symbolic");
       g_signal_connect (widget, "clicked", G_CALLBACK (on_bookmark_clicked), window);
-      gtk_button_set_child (GTK_BUTTON (widget), image);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), widget);
     }
diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui
index 867b5277ba..0662c8cf62 100644
--- a/tests/testsplitheaders.ui
+++ b/tests/testsplitheaders.ui
@@ -30,13 +30,13 @@
                 </style>
                 <child>
                   <object class="GtkButton">
-                    <property name="label">&lt;</property>
+                    <property name="icon-name">go-previous-symbolic</property>
                     <property name="valign">center</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkButton">
-                    <property name="label">&gt;</property>
+                    <property name="icon-name">go-next-symbolic</property>
                     <property name="valign">center</property>
                   </object>
                 </child>
diff --git a/tests/teststackedheaders.ui b/tests/teststackedheaders.ui
index 6112f77de9..981553110f 100644
--- a/tests/teststackedheaders.ui
+++ b/tests/teststackedheaders.ui
@@ -32,7 +32,7 @@
               <object class="GtkHeaderBar">
                 <child type="start">
                   <object class="GtkButton" id="back_btn">
-                    <property name="label">&lt;</property>
+                    <property name="icon-name">go-previous-symbolic</property>
                     <property name="valign">center</property>
                   </object>
                 </child>