diff --git a/clients/ovcc-gtk/data/ovcc-gtk.ui b/clients/ovcc-gtk/data/ovcc-gtk.ui
index 4c9eb680baa39d5ccd5e52ad290ce11e10ac5405..9fdd1bdb45612f4106c396035f8e4a061bce23bd 100644
--- a/clients/ovcc-gtk/data/ovcc-gtk.ui
+++ b/clients/ovcc-gtk/data/ovcc-gtk.ui
@@ -1,48 +1,113 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAction" id="edit-preferences">
+    <property name="label">_Preferences</property>
+    <property name="tooltip">Edit preferences</property>
+    <property name="stock_id">gtk-preferences</property>
+  </object>
+  <object class="GtkAction" id="game-connect">
+    <property name="label">_Connect to server</property>
+    <property name="tooltip">Connect to a game server</property>
+    <property name="stock_id">gtk-connect</property>
+    <signal name="activate" handler="game_connect_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="game-disconnect">
+    <property name="label">_Disconnect from server</property>
+    <property name="tooltip">Disconnect from the server</property>
+    <property name="stock_id">gtk-disconnect</property>
+    <signal name="activate" handler="game_disconnect_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="game-finish-turn">
+    <property name="label">Finish turn</property>
+    <property name="tooltip">Explicitely end your turn</property>
+    <property name="stock_id">gtk-ok</property>
+    <signal name="activate" handler="game_finish_turn_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="game-new">
+    <property name="label">_New game</property>
+    <property name="tooltip">Launch a new game server</property>
+    <property name="stock_id">gtk-new</property>
+  </object>
+  <object class="GtkAction" id="game-quit">
+    <property name="label">_Quit</property>
+    <property name="tooltip">Quit OVCCGtk</property>
+    <property name="stock_id">gtk-quit</property>
+    <signal name="activate" handler="game_quit_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="game-start">
+    <property name="label">_Start game</property>
+    <property name="tooltip">Start the game</property>
+    <signal name="activate" handler="game_start_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="help-about">
+    <property name="label">_About</property>
+    <property name="tooltip">About OVCCGtk</property>
+    <property name="stock_id">gtk-about</property>
+    <signal name="activate" handler="help_about_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="show-possible-actions">
+    <property name="label">_Show possible actions</property>
+    <property name="tooltip">Suggest something to play</property>
+    <property name="stock_id">gtk-dialog-question</property>
+  </object>
+  <object class="GtkAction" id="tile-rotate-clockwise">
+    <property name="label">Rotate clockwise</property>
+    <property name="tooltip">Rotate the tile clockwise</property>
+    <property name="icon_name">object-rotate-right</property>
+    <signal name="activate" handler="rotate_tile_clockwise_activate_handler" swapped="no"/>
+  </object>
+  <object class="GtkAction" id="tile-rotate-counterclockwise">
+    <property name="label">Rotate counter-clockwise</property>
+    <property name="tooltip">Rotate the tile counter-clockwise</property>
+    <property name="icon_name">object-rotate-left</property>
+    <signal name="activate" handler="rotate_tile_counterclockwise_activate_handler" swapped="no"/>
+  </object>
   <object class="GtkWindow" id="main-window">
+    <property name="can_focus">False</property>
     <property name="icon_name">ovccgtk</property>
-    <signal name="delete_event" handler="main_window_delete_event_handler"/>
+    <signal name="delete-event" handler="main_window_delete_event_handler" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="menuitem1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Game</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem1">
-                        <property name="visible">True</property>
                         <property name="related_action">game-new</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem2">
-                        <property name="visible">True</property>
                         <property name="related_action">game-connect</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="visible">True</property>
                         <property name="related_action">game-disconnect</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -50,13 +115,14 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="visible">True</property>
                         <property name="related_action">game-start</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -64,13 +130,14 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="visible">True</property>
                         <property name="related_action">game-quit</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -82,16 +149,18 @@
             <child>
               <object class="GtkMenuItem" id="menuitem2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="visible">True</property>
                         <property name="related_action">show-possible-actions</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -99,22 +168,23 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="visible">True</property>
                         <property name="related_action">tile-rotate-clockwise</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem4">
-                        <property name="visible">True</property>
                         <property name="related_action">tile-rotate-counterclockwise</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -122,26 +192,29 @@
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem11">
-                        <property name="visible">True</property>
                         <property name="related_action">game-finish-turn</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="visible">True</property>
                         <property name="related_action">edit-preferences</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -153,16 +226,18 @@
             <child>
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="visible">True</property>
                         <property name="related_action">help-about</property>
-                        <property name="use_action_appearance">True</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -174,17 +249,19 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkToolButton" id="toolbutton3">
-                <property name="visible">True</property>
                 <property name="related_action">show-possible-actions</property>
-                <property name="use_action_appearance">True</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">toolbutton3</property>
                 <property name="use_underline">True</property>
               </object>
@@ -195,9 +272,9 @@
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton4">
-                <property name="visible">True</property>
                 <property name="related_action">tile-rotate-counterclockwise</property>
-                <property name="use_action_appearance">True</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">toolbutton4</property>
                 <property name="use_underline">True</property>
               </object>
@@ -208,9 +285,9 @@
             </child>
             <child>
               <object class="GtkToolButton" id="toolbutton5">
-                <property name="visible">True</property>
                 <property name="related_action">tile-rotate-clockwise</property>
-                <property name="use_action_appearance">True</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">toolbutton5</property>
                 <property name="use_underline">True</property>
               </object>
@@ -222,6 +299,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -233,8 +311,6 @@
               <object class="GtkScrolledWindow" id="board-container">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -247,42 +323,47 @@
             <child>
               <object class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkScrolledWindow" id="players-container">
                         <property name="visible">True</property>
                         <property name="can_focus">True</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>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="tiles-left-counter-label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">No tile</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -290,32 +371,38 @@
                       <object class="GtkImage" id="current-tile-image">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
                         <property name="stock">gtk-missing-image</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xscale">0</property>
                         <child>
                           <object class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkButton" id="button3">
+                                <property name="use_action_appearance">False</property>
+                                <property name="related_action">tile-rotate-counterclockwise</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="related_action">tile-rotate-counterclockwise</property>
                                 <property name="relief">none</property>
                                 <property name="focus_on_click">False</property>
                                 <child>
                                   <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="icon_name">object-rotate-left</property>
                                   </object>
                                 </child>
@@ -328,15 +415,17 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="button4">
+                                <property name="use_action_appearance">False</property>
+                                <property name="related_action">tile-rotate-clockwise</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="related_action">tile-rotate-clockwise</property>
                                 <property name="relief">none</property>
                                 <property name="focus_on_click">False</property>
                                 <child>
                                   <object class="GtkImage" id="image4">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="icon_name">object-rotate-right</property>
                                   </object>
                                 </child>
@@ -353,36 +442,40 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHSeparator" id="hseparator1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">6</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="finish-turn-button">
+                        <property name="related_action">game-finish-turn</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="related_action">game-finish-turn</property>
-                        <property name="use_action_appearance">True</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -394,82 +487,24 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkStatusbar" id="main-statusbar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">2</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAction" id="game-quit">
-    <property name="label">_Quit</property>
-    <property name="tooltip">Quit OVCCGtk</property>
-    <property name="stock_id">gtk-quit</property>
-    <signal name="activate" handler="game_quit_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="game-new">
-    <property name="label">_New game</property>
-    <property name="tooltip">Launch a new game server</property>
-    <property name="stock_id">gtk-new</property>
-  </object>
-  <object class="GtkAction" id="game-connect">
-    <property name="label">_Connect to server</property>
-    <property name="tooltip">Connect to a game server</property>
-    <property name="stock_id">gtk-connect</property>
-    <signal name="activate" handler="game_connect_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="game-disconnect">
-    <property name="label">_Disconnect from server</property>
-    <property name="tooltip">Disconnect from the server</property>
-    <property name="stock_id">gtk-disconnect</property>
-    <signal name="activate" handler="game_disconnect_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="game-start">
-    <property name="label">_Start game</property>
-    <property name="tooltip">Start the game</property>
-    <signal name="activate" handler="game_start_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="show-possible-actions">
-    <property name="label">_Show possible actions</property>
-    <property name="tooltip">Suggest something to play</property>
-    <property name="stock_id">gtk-dialog-question</property>
-  </object>
-  <object class="GtkAction" id="edit-preferences">
-    <property name="label">_Preferences</property>
-    <property name="tooltip">Edit preferences</property>
-    <property name="stock_id">gtk-preferences</property>
-  </object>
-  <object class="GtkAction" id="tile-rotate-clockwise">
-    <property name="label">Rotate clockwise</property>
-    <property name="tooltip">Rotate the tile clockwise</property>
-    <property name="icon_name">object-rotate-right</property>
-    <signal name="activate" handler="rotate_tile_clockwise_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="tile-rotate-counterclockwise">
-    <property name="label">Rotate counter-clockwise</property>
-    <property name="tooltip">Rotate the tile counter-clockwise</property>
-    <property name="icon_name">object-rotate-left</property>
-    <signal name="activate" handler="rotate_tile_counterclockwise_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="game-finish-turn">
-    <property name="label">Finish turn</property>
-    <property name="tooltip">Explicitely end your turn</property>
-    <property name="stock_id">gtk-ok</property>
-    <signal name="activate" handler="game_finish_turn_activate_handler"/>
-  </object>
-  <object class="GtkAction" id="help-about">
-    <property name="label">_About</property>
-    <property name="tooltip">About OVCCGtk</property>
-    <property name="stock_id">gtk-about</property>
-    <signal name="activate" handler="help_about_activate_handler"/>
-  </object>
 </interface>