diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui
index 765f18a6a8f148bb13ef2edb49f4347439851bef..44ee0c8a216e99210a4285f55aeec8ec1ca454e1 100644
--- a/data/gui/chat_control.ui
+++ b/data/gui/chat_control.ui
@@ -278,13 +278,13 @@
                         <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="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>
                           <object class="GtkImage" id="emoticons_button_image">
                             <property name="visible">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="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property>
                             <property name="stock">gtk-missing-image</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -301,12 +301,12 @@
                         <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="tooltip_text" translatable="yes">Show a list of formattings</property>
                         <property name="relief">none</property>
                         <property name="focus_on_click">False</property>
                         <child>
                           <object class="GtkImage" id="image10">
                             <property name="visible">True</property>
-                            <property name="tooltip_text" translatable="yes">Show a list of formattings</property>
                             <property name="stock">gtk-bold</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -334,12 +334,12 @@
                         <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="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkImage" id="image9">
                             <property name="visible">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="tooltip_text" translatable="yes">Add this contact to roster (Ctrl+D)</property>
                             <property name="stock">gtk-add</property>
                             <property name="icon-size">1</property>
                           </object>
diff --git a/data/gui/groupchat_control.ui b/data/gui/groupchat_control.ui
index 4dd48771a2ef6026d4c5de4c4f350aa8738718e4..d32b6b023912b9769921e9fd610233f3f8e9046a 100644
--- a/data/gui/groupchat_control.ui
+++ b/data/gui/groupchat_control.ui
@@ -340,7 +340,7 @@
                 <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="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property>
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <child>
@@ -389,6 +389,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Send message</property>
                 <child>
                   <object class="GtkAlignment" id="alignment105">
                     <property name="visible">True</property>