diff --git a/gtk/main.ui b/gtk/main.ui
index c66728af5..8d29e5711 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -7,15 +7,10 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
   </object>
-  <object class="GtkImage" id="add_image1">
+  <object class="GtkImage" id="connect_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="add_image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="stock">gtk-connect</property>
   </object>
   <object class="GtkWindow" id="dummy_callee_frame">
     <property name="can_focus">False</property>
@@ -47,7 +42,6 @@
                           <object class="GtkButton" id="conference_control">
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -159,7 +153,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox11">
                         <property name="visible">True</property>
@@ -235,7 +228,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -262,7 +254,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <signal name="toggled" handler="linphone_gtk_record_call_toggled" swapped="no"/>
                   </object>
@@ -349,7 +340,7 @@
                   <object class="GtkHBox" id="encryption_box">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImage" id="image121">
+                      <object class="GtkImage" id="dialog_authenticator_image">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="stock">gtk-dialog-authentication</property>
@@ -391,7 +382,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_auth_token_verified_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -483,7 +473,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_answer_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -498,7 +487,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_decline_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -524,7 +512,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">Record this call to an audio file</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="toggled" handler="linphone_gtk_record_call_toggled" swapped="no"/>
                       </object>
@@ -567,7 +554,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                       </object>
                     </child>
                     <child>
@@ -576,7 +562,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_hold_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -590,7 +575,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_mute_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -604,7 +588,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -617,7 +600,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_terminate_call" swapped="no"/>
                       </object>
                       <packing>
@@ -633,7 +615,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -711,121 +692,20 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-edit</property>
   </object>
-  <object class="GtkImage" id="edit_image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
-  </object>
-  <object class="GtkImage" id="edit_image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-info</property>
-  </object>
-  <object class="GtkImage" id="image10">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image11">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-clear</property>
-  </object>
-  <object class="GtkImage" id="image12">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-connect</property>
-  </object>
-  <object class="GtkImage" id="image13">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image14">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image15">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image16">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image17">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-missing-image</property>
-  </object>
-  <object class="GtkImage" id="image18">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-select-color</property>
-  </object>
-  <object class="GtkImage" id="image19">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-refresh</property>
-  </object>
-  <object class="GtkImage" id="image20">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image21">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="yalign">0.49000000953674316</property>
-    <property name="stock">gtk-properties</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-properties</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-home</property>
-  </object>
-  <object class="GtkImage" id="image5">
+  <object class="GtkImage" id="execute_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-execute</property>
   </object>
-  <object class="GtkImage" id="image6">
+  <object class="GtkImage" id="home_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="stock">gtk-home</property>
   </object>
-  <object class="GtkImage" id="image7">
+  <object class="GtkImage" id="info_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image8">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image9">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="stock">gtk-info</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
@@ -880,6 +760,18 @@
       </row>
     </data>
   </object>
+  <object class="GtkImage" id="properties_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="yalign">0.49000000953674316</property>
+    <property name="stock">gtk-properties</property>
+  </object>
+  <object class="GtkImage" id="remove_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">Delete</property>
+    <property name="stock">gtk-remove</property>
+  </object>
   <object class="GtkWindow" id="main">
     <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>
@@ -898,7 +790,6 @@
               <object class="GtkMenuItem" id="options_menu">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Options</property>
                 <property name="use_underline">True</property>
                 <signal name="activate" handler="linphone_gtk_options_activate" swapped="no"/>
@@ -911,7 +802,6 @@
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="linphone_gtk_show_parameters" swapped="no"/>
@@ -921,7 +811,6 @@
                       <object class="GtkMenuItem" id="provisionning_item">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Set configuration URI</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="linphone_gtk_set_configuration_uri" swapped="no"/>
@@ -931,7 +820,6 @@
                       <object class="GtkImageMenuItem" id="disconnect_item">
                         <property name="label">gtk-disconnect</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="linphone_gtk_logout_clicked" swapped="no"/>
@@ -947,7 +835,6 @@
                       <object class="GtkCheckMenuItem" id="enable_video_item">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Always start video</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="linphone_gtk_enable_video" swapped="no"/>
@@ -957,7 +844,6 @@
                       <object class="GtkCheckMenuItem" id="selfview_item">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Enable self-view</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
@@ -974,7 +860,6 @@
                       <object class="GtkImageMenuItem" id="quit_item">
                         <property name="label">gtk-quit</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="gtk_main_quit" swapped="no"/>
@@ -988,7 +873,6 @@
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -1000,7 +884,6 @@
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="linphone_gtk_show_about" swapped="no"/>
@@ -1011,8 +894,7 @@
                         <property name="label" translatable="yes">Show debug window</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="image">image1</property>
+                        <property name="image">info_image</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="linphone_gtk_log_show" swapped="no"/>
                       </object>
@@ -1022,9 +904,8 @@
                         <property name="label" translatable="yes">_Homepage</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="image">image4</property>
+                        <property name="image">home_image</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="linphone_gtk_link_to_website" swapped="no"/>
                       </object>
@@ -1033,9 +914,8 @@
                       <object class="GtkImageMenuItem" id="versioncheck_item">
                         <property name="label" translatable="yes">Check _Updates</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="image">image5</property>
+                        <property name="image">execute_image</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="linphone_gtk_check_for_new_version" swapped="no"/>
                       </object>
@@ -1044,8 +924,7 @@
                       <object class="GtkImageMenuItem" id="assistant_item">
                         <property name="label" translatable="yes">Account assistant</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="image">image12</property>
+                        <property name="image">connect_image</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="linphone_gtk_show_assistant" swapped="no"/>
                       </object>
@@ -1055,8 +934,7 @@
                         <property name="label" translatable="yes">Audio assistant</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="image">image21</property>
+                        <property name="image">properties_image</property>
                         <property name="use_stock">False</property>
                         <signal name="activate" handler="linphone_gtk_show_audio_assistant" swapped="no"/>
                       </object>
@@ -1148,7 +1026,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">Initiate a new call</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_start_call" swapped="no"/>
                       </object>
                       <packing>
@@ -1164,7 +1041,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_start_call" swapped="no"/>
                       </object>
                       <packing>
@@ -1180,7 +1056,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="linphone_gtk_create_keypad" swapped="no"/>
                       </object>
                       <packing>
@@ -1266,8 +1141,6 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="resize_mode">immediate</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="image">add_image2</property>
                                 <property name="xalign">1</property>
                                 <signal name="clicked" handler="linphone_gtk_add_button_clicked" swapped="no"/>
                               </object>
@@ -1282,8 +1155,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="image">edit_image2</property>
+                                <property name="image">edit_image</property>
                                 <signal name="clicked" handler="linphone_gtk_edit_button_clicked" swapped="no"/>
                               </object>
                               <packing>
@@ -1297,8 +1169,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="image">remove_image2</property>
+                                <property name="image">remove_image</property>
                                 <signal name="clicked" handler="linphone_gtk_remove_button_clicked" swapped="no"/>
                               </object>
                               <packing>
@@ -1396,7 +1267,6 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="relief">none</property>
                                                 <signal name="clicked" handler="linphone_gtk_directory_search_button_clicked" swapped="no"/>
                                                 <child>
@@ -1463,8 +1333,7 @@
                                             <property name="label" translatable="yes">Add contact</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="image">image20</property>
+                                            <property name="image">add_image</property>
                                             <signal name="clicked" handler="linphone_gtk_add_contact" swapped="no"/>
                                           </object>
                                           <packing>
@@ -1498,7 +1367,6 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_stock">True</property>
                                         <signal name="clicked" handler="linphone_gtk_clear_call_logs" swapped="no"/>
                                       </object>
@@ -1636,7 +1504,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="relief">none</property>
                             <signal name="clicked" handler="on_proxy_refresh_button_clicked" swapped="no"/>
                           </object>
@@ -1706,6 +1573,9 @@
                                     <property name="can_focus">False</property>
                                     <property name="n_rows">5</property>
                                     <property name="n_columns">2</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                     <child>
                                       <object class="GtkLabel" id="label8">
                                         <property name="visible">True</property>
@@ -1772,7 +1642,6 @@
                                         <property name="can_focus">False</property>
                                         <property name="model">model4</property>
                                         <property name="active">0</property>
-                                        <!-- <signal name="changed" handler="linphone_gtk_internet_kind_changed" swapped="no"/> -->
                                         <child>
                                           <object class="GtkCellRendererText" id="renderer4"/>
                                           <attributes>
@@ -1793,7 +1662,6 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
                                       <packing>
@@ -1829,9 +1697,6 @@
                                         <property name="bottom_attach">3</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -1862,7 +1727,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="use_stock">True</property>
                                 <signal name="clicked" handler="linphone_gtk_login_frame_connect_clicked" swapped="no"/>
                               </object>
@@ -1930,7 +1794,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="relief">none</property>
                 <signal name="clicked" handler="linphone_gtk_my_presence_clicked" swapped="no"/>
               </object>
@@ -1951,22 +1814,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="remove_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Delete</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="remove_image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Delete</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="remove_image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Delete</property>
-    <property name="stock">gtk-remove</property>
-  </object>
 </interface>