diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index f3dcf916..0e6c49cd 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -27,13 +27,13 @@
   <object class="GtkImage" id="image12">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-new</property>
+    <property name="icon_name">document-new</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image13">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="icon_name">list-add</property>
     <property name="icon_size">1</property>
   </object>
   <object class="GtkImage" id="image18">
@@ -63,7 +63,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image12</property>
-        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -72,7 +71,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image13</property>
-        <property name="use_stock">False</property>
         <child type="submenu">
           <object class="GtkMenu" id="menu1">
             <property name="visible">True</property>
@@ -167,7 +165,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="image">image18</property>
-        <property name="use_stock">False</property>
         <child type="submenu">
           <object class="GtkMenu" id="menu2">
             <property name="visible">True</property>
@@ -178,7 +175,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="image">image20</property>
-                <property name="use_stock">False</property>
               </object>
             </child>
             <child>
@@ -187,7 +183,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="image">image19</property>
-                <property name="use_stock">False</property>
               </object>
             </child>
           </object>
@@ -1185,7 +1180,7 @@ Manager</property>
                                   <object class="GtkImage" id="image9">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-ok</property>
+                                    <property name="icon_name">dialog-ok</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1231,7 +1226,7 @@ Manager</property>
                                   <object class="GtkImage" id="image10">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-refresh</property>
+                                    <property name="icon_name">view-refresh</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1408,7 +1403,7 @@ Manager</property>
                           <object class="GtkImage" id="image1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-media-play</property>
+                            <property name="icon_name">media-playback-start</property>
                           </object>
                         </child>
                       </object>
@@ -1427,7 +1422,7 @@ Manager</property>
                           <object class="GtkImage" id="image2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-media-pause</property>
+                            <property name="icon_name">media-playback-pause</property>
                           </object>
                         </child>
                       </object>
@@ -1447,7 +1442,7 @@ Manager</property>
                           <object class="GtkImage" id="image3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-stop</property>
+                            <property name="icon_name">media-playback-stop</property>
                           </object>
                         </child>
                       </object>
@@ -1467,7 +1462,7 @@ Manager</property>
                           <object class="GtkImage" id="image4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-media-previous</property>
+                            <property name="icon_name">media-skip-backward</property>
                           </object>
                         </child>
                       </object>
@@ -1487,7 +1482,7 @@ Manager</property>
                           <object class="GtkImage" id="image5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-media-next</property>
+                            <property name="icon_name">media-skip-forward</property>
                           </object>
                         </child>
                       </object>
@@ -1631,9 +1626,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_title">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;span size='xx-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1645,9 +1640,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_artist">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1659,9 +1654,9 @@ Manager</property>
                           <object class="GtkLabel" id="o_album">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">&lt;span size='x-large'&gt;&lt;/span&gt;</property>
                             <property name="use_markup">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>