diff --git a/CHANGELOG b/CHANGELOG
index 194fe230..a42c1526 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 6.4.12:
+- Tooltip updates
 - Swap position of random/repeat and favorite/hide buttons
 
 6.4.12-rc:
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index be4f5e5d..960eb4a7 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -555,6 +555,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Randomly pick tracks</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="image">image9</property>
@@ -572,6 +573,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Repeat tracks</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="image">image10</property>
@@ -623,7 +625,7 @@
                         <property name="can_focus">False</property>
                         <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Add track to Favorites playlist</property>
+                        <property name="tooltip_text" translatable="yes">Add current track to Favorites playlist</property>
                         <property name="inconsistent">True</property>
                         <child>
                           <object class="GtkImage" id="image6">
@@ -645,7 +647,7 @@
                         <property name="can_focus">False</property>
                         <property name="focus_on_click">False</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Hide track from Collection</property>
+                        <property name="tooltip_text" translatable="yes">Hide current track from Collection</property>
                         <child>
                           <object class="GtkImage" id="image7">
                             <property name="visible">True</property>