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/headerbar.c b/demos/gtk-demo/headerbar.c
index dab3ccffa5..590343bd94 100644
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -42,10 +42,10 @@ do_headerbar (GtkWidget *do_widget)
       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"));
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_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"));
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_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>