diff --git a/gtk/main.c b/gtk/main.c
index a8b15c327..bf458c0e6 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1152,6 +1152,7 @@ static void linphone_gtk_configure_main_window(){
 	static const char *search_icon;
 	static gboolean update_check_menu;
 	static gboolean buttons_have_borders;
+	static gboolean show_abcd;
 	GtkWidget *w=linphone_gtk_get_main_window();
 	if (!config_loaded){
 		title=linphone_gtk_get_ui_config("title","Linphone");
@@ -1162,6 +1163,7 @@ static void linphone_gtk_configure_main_window(){
 		search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL);
 		update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0);
 		buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1);
+		show_abcd=linphone_gtk_get_ui_config_int("show_abcd",1);
 		config_loaded=TRUE;
 	}
 	linphone_gtk_configure_window(w,"main_window");
@@ -1219,6 +1221,9 @@ static void linphone_gtk_configure_main_window(){
 	if (update_check_menu){
 		gtk_widget_show(linphone_gtk_get_widget(w,"versioncheck_item"));
 	}
+	if (!show_abcd){
+		gtk_table_resize(GTK_TABLE(linphone_gtk_get_widget(w,"dtmf_table")),4,3);
+	}
 }
 
 void linphone_gtk_manage_login(void){
diff --git a/gtk/main.ui b/gtk/main.ui
index 0d207b8d5..35a01aff5 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -523,6 +523,29 @@
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
+                                            <child>
+                                              <object class="GtkHButtonBox" id="hbuttonbox1">
+                                                <property name="visible">True</property>
+                                                <child>
+                                                  <object class="GtkButton" id="add_contact_button">
+                                                    <property name="label">gtk-add</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">True</property>
+                                                    <property name="use_stock">True</property>
+                                                    <signal name="clicked" handler="linphone_gtk_add_contact"/>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="position">3</property>
+                                              </packing>
+                                            </child>
                                           </object>
                                         </child>
                                       </object>
diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 9d7f79e38..f4ab298ad 100644
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -1,55 +1,56 @@
 <?xml version="1.0"?>
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">3001</property>
-    <property name="lower">500</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">10</property>
     <property name="value">500</property>
+    <property name="lower">500</property>
+    <property name="upper">3001</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">65535</property>
-    <property name="lower">1</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">10</property>
     <property name="value">1</property>
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">65535</property>
-    <property name="lower">1</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">10</property>
     <property name="value">1</property>
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">65535</property>
-    <property name="lower">1</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">10</property>
     <property name="value">1</property>
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
-    <property name="upper">100000</property>
     <property name="lower">-1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100000</property>
     <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
     <property name="page_size">10</property>
-    <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
-    <property name="upper">100000</property>
     <property name="lower">-1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100000</property>
     <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
     <property name="page_size">10</property>
-    <property name="value">0</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -60,6 +61,7 @@
   </object>
   <object class="GtkListStore" id="model2">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -70,6 +72,7 @@
   </object>
   <object class="GtkListStore" id="model3">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -80,6 +83,7 @@
   </object>
   <object class="GtkListStore" id="model4">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -90,6 +94,7 @@
   </object>
   <object class="GtkListStore" id="model5">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -100,6 +105,7 @@
   </object>
   <object class="GtkListStore" id="model6">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -113,6 +119,7 @@
   </object>
   <object class="GtkListStore" id="model7">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -121,8 +128,6 @@
       </row>
     </data>
   </object>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="parameters">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Settings</property>
@@ -166,7 +171,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal handler="linphone_gtk_mtu_set" name="toggled"/>
+                                    <signal name="toggled" handler="linphone_gtk_mtu_set"/>
                                   </object>
                                   <packing>
                                     <property name="position">0</property>
@@ -177,7 +182,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <signal handler="linphone_gtk_mtu_changed" name="value_changed"/>
+                                    <signal name="value_changed" handler="linphone_gtk_mtu_changed"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -195,7 +200,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="linphone_gtk_use_sip_info_dtmf_toggled" name="toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_sip_info_dtmf_toggled"/>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -209,7 +214,7 @@
                                 <property name="receives_default">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="draw_indicator">True</property>
-                                <signal handler="linphone_gtk_ipv6_toggled" name="toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_ipv6_toggled"/>
                               </object>
                               <packing>
                                 <property name="position">2</property>
@@ -255,7 +260,7 @@
                                 <property name="can_focus">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="adjustment">adjustment2</property>
-                                <signal handler="linphone_gtk_video_port_changed" name="value_changed"/>
+                                <signal name="value_changed" handler="linphone_gtk_video_port_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -270,7 +275,7 @@
                                 <property name="can_focus">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="adjustment">adjustment3</property>
-                                <signal handler="linphone_gtk_audio_port_changed" name="value_changed"/>
+                                <signal name="value_changed" handler="linphone_gtk_audio_port_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -285,7 +290,7 @@
                                 <property name="can_focus">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="adjustment">adjustment4</property>
-                                <signal handler="linphone_gtk_sip_port_changed" name="value_changed"/>
+                                <signal name="value_changed" handler="linphone_gtk_sip_port_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -359,7 +364,7 @@
                             <property name="receives_default">False</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="linphone_gtk_no_firewall_toggled" name="toggled"/>
+                            <signal name="toggled" handler="linphone_gtk_no_firewall_toggled"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -380,7 +385,7 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">no_nat</property>
-                                <signal handler="linphone_gtk_use_nat_address_toggled" name="toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_nat_address_toggled"/>
                               </object>
                               <packing>
                                 <property name="position">0</property>
@@ -406,7 +411,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal handler="linphone_gtk_nat_address_changed" name="changed"/>
+                                    <signal name="changed" handler="linphone_gtk_nat_address_changed"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -437,7 +442,7 @@
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">no_nat</property>
-                                <signal handler="linphone_gtk_use_stun_toggled" name="toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_stun_toggled"/>
                               </object>
                               <packing>
                                 <property name="position">0</property>
@@ -463,7 +468,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal handler="linphone_gtk_stun_server_changed" name="changed"/>
+                                    <signal name="changed" handler="linphone_gtk_stun_server_changed"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -557,7 +562,7 @@
                                   <object class="GtkFileChooserButton" id="ring_chooser">
                                     <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>
-                                    <signal handler="linphone_gtk_ring_file_set" name="file_set"/>
+                                    <signal name="file_set" handler="linphone_gtk_ring_file_set"/>
                                   </object>
                                   <packing>
                                     <property name="position">0</property>
@@ -571,7 +576,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="use_stock">True</property>
-                                    <signal handler="linphone_gtk_play_ring_file" name="clicked"/>
+                                    <signal name="clicked" handler="linphone_gtk_play_ring_file"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -603,7 +608,7 @@
                               <object class="GtkEntry" id="alsa_dev">
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal handler="linphone_gtk_alsa_special_device_changed" name="editing_done"/>
+                                <signal name="editing_done" handler="linphone_gtk_alsa_special_device_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -617,8 +622,8 @@
                               <object class="GtkComboBox" id="capture_device">
                                 <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>
-                                <signal handler="linphone_gtk_capture_device_changed" name="changed"/>
                                 <property name="model">model1</property>
+                                <signal name="changed" handler="linphone_gtk_capture_device_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer1"/>
                                   <attributes>
@@ -638,8 +643,8 @@
                               <object class="GtkComboBox" id="ring_device">
                                 <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>
-                                <signal handler="linphone_gtk_ring_device_changed" name="changed"/>
                                 <property name="model">model2</property>
+                                <signal name="changed" handler="linphone_gtk_ring_device_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer2"/>
                                   <attributes>
@@ -709,8 +714,8 @@
                               <object class="GtkComboBox" id="playback_device">
                                 <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>
-                                <signal handler="linphone_gtk_playback_device_changed" name="changed"/>
                                 <property name="model">model3</property>
+                                <signal name="changed" handler="linphone_gtk_playback_device_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer3"/>
                                   <attributes>
@@ -732,7 +737,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal handler="linphone_gtk_echo_cancelation_toggled" name="toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_echo_cancelation_toggled"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -762,7 +767,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame4">
+                  <object class="GtkFrame" id="video_fram">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <child>
@@ -787,8 +792,8 @@
                             <child>
                               <object class="GtkComboBox" id="webcams">
                                 <property name="visible">True</property>
-                                <signal handler="linphone_gtk_cam_changed" name="changed"/>
                                 <property name="model">model4</property>
+                                <signal name="changed" handler="linphone_gtk_cam_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer4"/>
                                   <attributes>
@@ -815,9 +820,9 @@
                             <child>
                               <object class="GtkComboBox" id="video_size">
                                 <property name="visible">True</property>
-                                <property name="active">0</property>
-                                <signal handler="linphone_gtk_video_size_changed" name="changed"/>
                                 <property name="model">model5</property>
+                                <property name="active">0</property>
+                                <signal name="changed" handler="linphone_gtk_video_size_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer5"/>
                                   <attributes>
@@ -850,6 +855,9 @@
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkHBox" id="hbox11">
@@ -890,7 +898,7 @@
                   <object class="GtkFrame" id="frame11">
                     <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">This section defines your SIP address when not using a SIP account</property>
+                    <property name="tooltip_text" translatable="yes">This section defines your SIP address when not using a SIP account</property>
                     <property name="label_xalign">0</property>
                     <child>
                       <object class="GtkAlignment" id="alignment11">
@@ -915,7 +923,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal handler="linphone_gtk_update_my_contact" name="changed"/>
+                                <signal name="changed" handler="linphone_gtk_update_my_contact"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -949,7 +957,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal handler="linphone_gtk_update_my_contact" name="changed"/>
+                                <signal name="changed" handler="linphone_gtk_update_my_contact"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1033,7 +1041,7 @@
                                     <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>
-                                    <signal handler="linphone_gtk_add_proxy" name="clicked"/>
+                                    <signal name="clicked" handler="linphone_gtk_add_proxy"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox14">
                                         <property name="visible">True</property>
@@ -1073,7 +1081,7 @@
                                     <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>
-                                    <signal handler="linphone_gtk_edit_proxy" name="clicked"/>
+                                    <signal name="clicked" handler="linphone_gtk_edit_proxy"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox16">
                                         <property name="visible">True</property>
@@ -1113,7 +1121,7 @@
                                     <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>
-                                    <signal handler="linphone_gtk_remove_proxy" name="clicked"/>
+                                    <signal name="clicked" handler="linphone_gtk_remove_proxy"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox7">
                                         <property name="visible">True</property>
@@ -1151,7 +1159,7 @@
                                   <object class="GtkButton" id="create_phonics">
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <signal handler="linphone_gtk_create_fonics_account" name="clicked"/>
+                                    <signal name="clicked" handler="linphone_gtk_create_fonics_account"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox1">
                                         <property name="visible">True</property>
@@ -1227,7 +1235,7 @@ virtual network !</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>
-                                <signal handler="linphone_gtk_clear_passwords" name="clicked"/>
+                                <signal name="clicked" handler="linphone_gtk_clear_passwords"/>
                                 <child>
                                   <object class="GtkHBox" id="hbox18">
                                     <property name="visible">True</property>
@@ -1279,6 +1287,9 @@ virtual network !</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkHBox" id="hbox10">
@@ -1334,9 +1345,9 @@ virtual network !</property>
                               <object class="GtkComboBox" id="codec_view">
                                 <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="active">0</property>
-                                <signal handler="linphone_gtk_codec_view_changed" name="changed"/>
                                 <property name="model">model6</property>
+                                <property name="active">0</property>
+                                <signal name="changed" handler="linphone_gtk_codec_view_changed"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer6"/>
                                   <attributes>
@@ -1387,7 +1398,7 @@ virtual network !</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="use_stock">True</property>
-                                        <signal handler="linphone_gtk_codec_up" name="clicked"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_up"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1403,7 +1414,7 @@ virtual network !</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="use_stock">True</property>
-                                        <signal handler="linphone_gtk_codec_down" name="clicked"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_down"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1417,7 +1428,7 @@ virtual network !</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>
-                                        <signal handler="linphone_gtk_codec_enable" name="clicked"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_enable"/>
                                         <child>
                                           <object class="GtkHBox" id="hbox8">
                                             <property name="visible">True</property>
@@ -1457,7 +1468,7 @@ virtual network !</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>
-                                        <signal handler="linphone_gtk_codec_disable" name="clicked"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_disable"/>
                                         <child>
                                           <object class="GtkHBox" id="hbox9">
                                             <property name="visible">True</property>
@@ -1540,9 +1551,9 @@ virtual network !</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">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">0 stands for "unlimited"</property>
+                                <property name="tooltip_text" translatable="yes">0 stands for "unlimited"</property>
                                 <property name="adjustment">adjustment5</property>
-                                <signal handler="linphone_gtk_upload_bw_changed" name="value_changed"/>
+                                <signal name="value_changed" handler="linphone_gtk_upload_bw_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1556,9 +1567,9 @@ virtual network !</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">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">0 stands for "unlimited"</property>
+                                <property name="tooltip_text" translatable="yes">0 stands for "unlimited"</property>
                                 <property name="adjustment">adjustment6</property>
-                                <signal handler="linphone_gtk_download_bw_changed" name="value_changed"/>
+                                <signal name="value_changed" handler="linphone_gtk_download_bw_changed"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1603,6 +1614,9 @@ virtual network !</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkHBox" id="hbox15">
@@ -1649,8 +1663,8 @@ virtual network !</property>
                         <child>
                           <object class="GtkComboBox" id="lang_combo">
                             <property name="visible">True</property>
-                            <signal handler="linphone_gtk_lang_changed" name="changed"/>
                             <property name="model">model7</property>
+                            <signal name="changed" handler="linphone_gtk_lang_changed"/>
                             <child>
                               <object class="GtkCellRendererText" id="renderer7"/>
                               <attributes>
@@ -1689,7 +1703,7 @@ virtual network !</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="linphone_gtk_ui_level_toggled" name="toggled"/>
+                            <signal name="toggled" handler="linphone_gtk_ui_level_toggled"/>
                           </object>
                         </child>
                       </object>
@@ -1708,6 +1722,9 @@ virtual network !</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkHBox" id="hbox4">
@@ -1753,7 +1770,7 @@ virtual network !</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>
-                <signal handler="linphone_gtk_parameters_closed" name="clicked"/>
+                <signal name="clicked" handler="linphone_gtk_parameters_closed"/>
                 <child>
                   <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>