diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui
index 66ab6b8b2..cbad5e0cc 100644
--- a/data/gui/chat_control.ui
+++ b/data/gui/chat_control.ui
@@ -1,18 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">110</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">110</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
   <object class="GtkHBox" id="chat_control_hbox">
     <property name="can_focus">True</property>
     <property name="spacing">1</property>
@@ -20,6 +9,7 @@
       <object class="GtkVBox" id="chat_control_vbox">
         <property name="can_focus">True</property>
         <property name="border_width">3</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">1</property>
         <child>
           <object class="GtkHPaned" id="hpaned1">
@@ -28,25 +18,21 @@
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkAlignment" id="alignment">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="left_padding">3</property>
                     <property name="right_padding">3</property>
                     <child>
                       <object class="GtkEventBox" id="banner_eventbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkHBox" id="hbox3004">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkImage" id="banner_status_image">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="ypad">5</property>
                                 <property name="stock">gtk-missing-image</property>
                               </object>
@@ -60,98 +46,78 @@
                             <child>
                               <object class="GtkVBox" id="banner_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="border_width">5</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkLabel" id="banner_name_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label">&lt;span weight="heavy" size="large"&gt;Contact name&lt;/span&gt;</property>
                                     <property name="use_markup">True</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="banner_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label">label</property>
                                     <property name="use_markup">True</property>
                                     <property name="selectable">True</property>
-                                    <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/>
+                                    <signal name="populate_popup" handler="on_banner_label_populate_popup"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="spacing">4</property>
                                 <child>
                                   <object class="GtkImage" id="mood_image">
-                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="stock">None</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkImage" id="activity_image">
-                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="stock">None</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkImage" id="tune_image">
-                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="stock">None</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEventBox" id="location_eventbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="visible_window">False</property>
                                     <child>
                                       <object class="GtkImage" id="location_image">
-                                        <property name="can_focus">False</property>
                                         <property name="no_show_all">True</property>
                                         <property name="stock">None</property>
                                         <property name="icon-size">1</property>
@@ -167,26 +133,20 @@
                                 <child>
                                   <object class="GtkImage" id="audio_banner_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="stock">None</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkImage" id="video_banner_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="stock">None</property>
                                     <property name="icon-size">1</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">5</property>
                                   </packing>
                                 </child>
@@ -194,14 +154,11 @@
                                   <object class="GtkAlignment" id="alignment3">
                                     <property name="width_request">11</property>
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <placeholder/>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">6</property>
                                   </packing>
                                 </child>
@@ -215,12 +172,10 @@
                             <child>
                               <object class="GtkEventBox" id="avatar_eventbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="visible_window">False</property>
                                 <child>
                                   <object class="GtkImage" id="avatar_image">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="stock">None</property>
                                   </object>
                                 </child>
@@ -245,27 +200,26 @@
                 <child>
                   <object class="GtkVBox" id="vbox106">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkScrolledWindow" id="conversation_scrolledwindow">
                         <property name="height_request">60</property>
                         <property name="can_focus">True</property>
                         <property name="border_width">3</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <placeholder/>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
                           <object class="GtkButton" id="authentication_button">
@@ -277,7 +231,6 @@
                             <property name="focus_on_click">False</property>
                             <child>
                               <object class="GtkImage" id="lock_image">
-                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="stock">gtk-dialog-authentication</property>
                                 <property name="icon-size">1</property>
@@ -286,7 +239,6 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -303,43 +255,36 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="actions_hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkButton" id="emoticons_button">
                         <property name="visible">True</property>
                         <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="can_focus">False</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>
@@ -347,7 +292,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -357,13 +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="can_focus">False</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>
@@ -371,19 +314,17 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVSeparator" id="vseparator1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -393,13 +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="can_focus">False</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>
@@ -422,7 +362,6 @@
                         <child>
                           <object class="GtkImage" id="image3">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -430,7 +369,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
@@ -438,12 +376,10 @@
                       <object class="GtkToggleButton" id="audio_togglebutton">
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Toggle audio session</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkImage" id="audio_image">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="stock">gtk-missing-image</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -451,7 +387,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">5</property>
                       </packing>
                     </child>
@@ -459,12 +394,10 @@
                       <object class="GtkToggleButton" id="video_togglebutton">
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Toggle video session</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkImage" id="video_image">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="stock">gtk-missing-image</property>
                             <property name="icon-size">1</property>
                           </object>
@@ -472,7 +405,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">6</property>
                       </packing>
                     </child>
@@ -482,13 +414,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">Invite contacts to the conversation (Ctrl+G)</property>
+                        <property name="tooltip_text" translatable="yes">Invite contacts to the conversation</property>
                         <property name="relief">none</property>
                         <property name="focus_on_click">False</property>
                         <child>
                           <object class="GtkImage" id="convert_to_gc_button_image">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="stock">gtk-missing-image</property>
                             <property name="icon-size">1</property>
@@ -497,7 +428,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">7</property>
                       </packing>
                     </child>
@@ -507,13 +437,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">Invite contacts to the conversation (Ctrl+G)</property>
+                        <property name="tooltip_text" translatable="yes">View contact information</property>
                         <property name="relief">none</property>
                         <property name="focus_on_click">False</property>
                         <child>
                           <object class="GtkImage" id="image2">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="stock">gtk-info</property>
                             <property name="icon-size">1</property>
@@ -522,7 +451,6 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">8</property>
                       </packing>
                     </child>
@@ -538,7 +466,6 @@
                         <child>
                           <object class="GtkImage" id="image5">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="stock">gtk-justify-fill</property>
                             <property name="icon-size">1</property>
@@ -547,19 +474,17 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVSeparator" id="vseparator3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">10</property>
                       </packing>
                     </child>
@@ -569,13 +494,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 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>
                           <object class="GtkImage" id="image1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="stock">gtk-execute</property>
                             <property name="icon-size">1</property>
@@ -584,22 +508,19 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">11</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="audio_buttons_hbox">
-                        <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <child>
                           <object class="GtkVSeparator" id="vseparator2">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -608,6 +529,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="use_action_appearance">True</property>
                             <property name="relief">none</property>
                             <property name="focus_on_click">False</property>
                             <property name="orientation">vertical</property>
@@ -620,7 +542,6 @@ audio-volume-medium</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -629,6 +550,7 @@ audio-volume-medium</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="use_action_appearance">True</property>
                             <property name="relief">none</property>
                             <property name="focus_on_click">False</property>
                             <property name="yalign">0.4699999988079071</property>
@@ -642,7 +564,6 @@ audio-mic-volume-low</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -655,41 +576,32 @@ audio-mic-volume-low</property>
                             <property name="relief">none</property>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">12</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkComboBox" id="label_selector">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">13</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
                           <placeholder/>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">14</property>
                       </packing>
                     </child>
@@ -698,21 +610,19 @@ audio-mic-volume-low</property>
                         <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="alignment102">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="xscale">0</property>
                             <property name="yscale">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox3010">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkImage" id="image1339">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-jump-to</property>
                                   </object>
                                   <packing>
@@ -724,7 +634,6 @@ audio-mic-volume-low</property>
                                 <child>
                                   <object class="GtkLabel" id="label373">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</property>
                                     <property name="use_underline">True</property>
                                   </object>
@@ -741,14 +650,12 @@ audio-mic-volume-low</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">15</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -760,26 +667,22 @@ audio-mic-volume-low</property>
             </child>
             <child>
               <object class="GtkHBox" id="video_hbox">
-                <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkFixed" id="outgoing_fixed">
-                    <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="width_request">160</property>
                         <property name="height_request">120</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="resize_mode">queue</property>
                         <child>
                           <object class="GtkDrawingArea" id="outgoing_drawingarea">
                             <property name="width_request">160</property>
                             <property name="height_request">120</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="double_buffered">False</property>
                           </object>
                         </child>
@@ -788,32 +691,27 @@ audio-mic-volume-low</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkViewport" id="viewport2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="resize_mode">queue</property>
                         <child>
                           <object class="GtkDrawingArea" id="incoming_drawingarea">
                             <property name="width_request">320</property>
                             <property name="height_request">240</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="double_buffered">False</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -822,8 +720,6 @@ audio-mic-volume-low</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -835,21 +731,28 @@ audio-mic-volume-low</property>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">110</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">110</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkWindow" id="dtmf_window">
-    <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">mouse</property>
@@ -861,7 +764,6 @@ audio-mic-volume-low</property>
     <child>
       <object class="GtkTable" id="table2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="n_rows">4</property>
         <property name="n_columns">3</property>
         <property name="homogeneous">True</property>
diff --git a/src/chat_control.py b/src/chat_control.py
index d18c145f8..f980f8ba3 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1801,7 +1801,7 @@ class ChatControl(ChatControlBase):
         self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \
         self.type_id == 'chat' or self.gc_contact.resource:
             self._send_file_button.set_sensitive(True)
-            self._send_file_button.set_tooltip_text('')
+            self._send_file_button.set_tooltip_text(_('Send files'))
         else:
             self._send_file_button.set_sensitive(False)
             if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)):