diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui
index 6a4fcd9b8..e632a9c31 100644
--- a/data/gui/chat_control.ui
+++ b/data/gui/chat_control.ui
@@ -270,6 +270,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -292,6 +294,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Show a list of formattings</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -324,6 +328,8 @@
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="no_show_all">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="image9">
@@ -365,6 +371,8 @@
               <object class="GtkToggleButton" id="audio_togglebutton">
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Toggle audio session</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="audio_image">
@@ -383,6 +391,8 @@
               <object class="GtkToggleButton" id="video_togglebutton">
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Toggle video session</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="video_image">
@@ -403,6 +413,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -425,6 +437,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -447,6 +461,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -480,6 +496,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
diff --git a/data/gui/groupchat_control.ui b/data/gui/groupchat_control.ui
index 86f9ee82b..d181491e8 100644
--- a/data/gui/groupchat_control.ui
+++ b/data/gui/groupchat_control.ui
@@ -166,6 +166,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property>
                 <property name="relief">none</property>
                 <child>
                   <object class="GtkImage" id="emoticons_button_image">
@@ -193,6 +195,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Show a list of formattings</property>
             <property name="relief">none</property>
             <property name="focus_on_click">False</property>
             <child>
@@ -224,6 +228,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Change your nickname (Ctrl+N)</property>
             <property name="relief">none</property>
             <child>
               <object class="GtkImage" id="image4">
@@ -246,6 +252,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Change the room's subject (Alt+T)</property>
             <property name="relief">none</property>
             <child>
               <object class="GtkImage" id="image6">
@@ -269,6 +277,8 @@
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="no_show_all">True</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property>
             <property name="relief">none</property>
             <child>
               <object class="GtkImage" id="image7">
@@ -291,6 +301,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property>
             <property name="relief">none</property>
             <child>
               <object class="GtkImage" id="image8">
@@ -323,6 +335,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property>
             <property name="relief">none</property>
             <property name="focus_on_click">False</property>
             <child>