Merge branch 'ui-work-672043'

13 files changed, 741 insertions, 445 deletions

diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/libempathy-gtk/empathy-account-widget-aim.ui
index cbabbf5ba..8ceacbf47 100644
--- a/libempathy-gtk/empathy-account-widget-aim.ui
+++ b/libempathy-gtk/empathy-account-widget-aim.ui
@@ -20,10 +20,13 @@
         <child>
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -32,10 +35,13 @@
         <child>
           <object class="GtkLabel" id="label_screenname">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Screen _Name:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Screen _Name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_screenname</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
           </packing>
@@ -119,6 +125,7 @@
                 <property name="adjustment">adjustment1</property>
                 <property name="climb_rate">1</property>
                 <property name="numeric">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -128,12 +135,16 @@
             <child>
               <object class="GtkLabel" id="label_port">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Port:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Port</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spinbutton_port</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
               </packing>
             </child>
@@ -141,20 +152,27 @@
               <object class="GtkEntry" id="entry_server">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label_server">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Server:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Server</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_server</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
diff --git a/libempathy-gtk/empathy-account-widget-generic.ui b/libempathy-gtk/empathy-account-widget-generic.ui
index 0ddfec689..c37da5e01 100644
--- a/libempathy-gtk/empathy-account-widget-generic.ui
+++ b/libempathy-gtk/empathy-account-widget-generic.ui
@@ -1,16 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkVBox" id="vbox_generic_settings">
     <property name="visible">True</property>
-    <property name="orientation">vertical</property>
+    <property name="can_focus">False</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkGrid" id="grid_common_settings">
         <property name="visible">True</property>
-        <property name="column_spacing">12</property>
+        <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -24,20 +51,50 @@
         <property name="can_focus">True</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="height_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">6</property>
                 <property name="resize_mode">queue</property>
                 <child>
                   <object class="GtkGrid" id="grid_advanced_settings">
                     <property name="visible">True</property>
-                    <property name="column_spacing">12</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -47,6 +104,7 @@
         <child type="label">
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Advanced</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -55,6 +113,8 @@
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui b/libempathy-gtk/empathy-account-widget-groupwise.ui
index 9be839bf4..cfca2e345 100644
--- a/libempathy-gtk/empathy-account-widget-groupwise.ui
+++ b/libempathy-gtk/empathy-account-widget-groupwise.ui
@@ -19,9 +19,12 @@
         <child>
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -30,10 +33,13 @@
         <child>
           <object class="GtkLabel" id="label_id">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Login I_D</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_id</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
           </packing>
@@ -112,10 +118,13 @@
             <child>
               <object class="GtkLabel" id="label_port">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Port:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Port</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spinbutton_port</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -124,10 +133,13 @@
             <child>
               <object class="GtkLabel" id="label_server">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Server:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Server</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_server</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
index d95027f3e..865a33c08 100644
--- a/libempathy-gtk/empathy-account-widget-icq.ui
+++ b/libempathy-gtk/empathy-account-widget-icq.ui
@@ -20,10 +20,13 @@
         <child>
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -32,10 +35,13 @@
         <child>
           <object class="GtkLabel" id="label_uin">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">ICQ _UIN:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">ICQ _UIN</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_uin</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
           </packing>
@@ -115,10 +121,13 @@
             <child>
               <object class="GtkLabel" id="label_charset">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Ch_aracter set:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Ch_aracter set</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_charset</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
               </packing>
@@ -149,10 +158,13 @@
             <child>
               <object class="GtkLabel" id="label_port">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Port:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Port</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spinbutton_port</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">2</property>
@@ -162,10 +174,13 @@
             <child>
               <object class="GtkLabel" id="label_server">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Server:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Server</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_server</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">1</property>
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 95f30a2f6..fc72974b3 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -66,8 +66,11 @@
                       <object class="GtkLabel" id="label_network">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Network:</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Network</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -80,8 +83,11 @@
                       <object class="GtkLabel" id="label_charset">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Character set:</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Character set</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -159,6 +165,7 @@
 	                <property name="spacing">0</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow_network_server">
+                        <property name="height_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
@@ -238,7 +245,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
@@ -331,9 +338,12 @@
           <object class="GtkLabel" id="label_network2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Network:</property>
-            <property name="use_underline">True</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Network</property>
+            <property name="use_underline">True</property>A
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -346,10 +356,13 @@
           <object class="GtkLabel" id="label_nick">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Nickname:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Nickname</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_nick</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -362,8 +375,11 @@
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -405,8 +421,11 @@
               <object class="GtkLabel" id="label_quit_message">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Quit message:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Quit message</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -431,10 +450,13 @@
               <object class="GtkLabel" id="label_fullname">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Real name:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Real name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_nick</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -447,9 +469,12 @@
               <object class="GtkLabel" id="label_username">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Username:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Username</property>
                 <property name="use_underline">True</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index 1dde7c93f..0ae306633 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">0</property>
     <property name="upper">127</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
@@ -325,6 +324,24 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -355,10 +372,13 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
           <object class="GtkLabel" id="label_id">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Login I_D</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_id</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -371,11 +391,14 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
             <property name="justify">right</property>
             <property name="mnemonic_widget">entry_password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -384,6 +407,18 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
             <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -397,6 +432,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <property name="can_focus">True</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="height_request">200</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
@@ -407,199 +443,202 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                 <property name="can_focus">False</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkVBox" id="vbox_advanced">
+                  <object class="GtkGrid" id="grid_advanced_settings">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
+                    <property name="border_width">6</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="n_rows">8</property>
+                    <property name="n_columns">2</property>
+                    <child>
+                      <object class="GtkEntry" id="entry_resource">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="spinbutton_priority">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="climb_rate">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                     <child>
-                      <object class="GtkGrid" id="grid_advanced_settings">
+                      <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors">
+                        <property name="label" translatable="yes">I_gnore SSL certificate errors</property>
+                        <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="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_priority">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="entry_resource">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_priority">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="climb_rate">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors">
-                            <property name="label" translatable="yes">I_gnore SSL certificate errors</property>
-                            <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="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_priority">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Priori_ty:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">spinbutton_priority</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_resource">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Reso_urce:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">entry_resource</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="checkbutton_encryption">
-                            <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</property>
-                            <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="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Priori_ty</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton_priority</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame1">
+                      <object class="GtkLabel" id="label_resource">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
-                        <child>
-                          <object class="GtkGrid" id="grid1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="column_spacing">6</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkSpinButton" id="spinbutton_port">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment2</property>
-                                <property name="climb_rate">1</property>
-                                <property name="numeric">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEntry" id="entry_server">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_ssl">
-                                <property name="label" translatable="yes">Use old SS_L</property>
-                                <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="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label_port">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Port:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">spinbutton_port</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label_server">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Server:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">entry_server</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Override server settings</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Reso_urce</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">entry_resource</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_encryption">
+                        <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</property>
+                        <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="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Override server settings</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_server">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">_Server</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">entry_server</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_port">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">_Port</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton_port</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_ssl">
+                        <property name="label" translatable="yes">Use old SS_L</property>
+                        <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="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">7</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entry_server">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="spinbutton_port">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index 7e7cfe8e6..460c41cbf 100644
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -46,10 +46,13 @@
         <child>
           <object class="GtkLabel" id="label_nickname">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Nic_kname:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Nic_kname</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_nickname</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -59,10 +62,13 @@
         <child>
           <object class="GtkLabel" id="label_last_name">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Last Name:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Last Name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_last_name</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">1</property>
@@ -72,10 +78,13 @@
         <child>
           <object class="GtkLabel" id="label_first_name">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_First Name:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_First Name</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_first_name</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -110,10 +119,13 @@
             <child>
               <object class="GtkLabel" id="label_published">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Published Name:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Published Name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_published</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -144,10 +156,13 @@
             <child>
               <object class="GtkLabel" id="label_jid">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Jabber ID:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Jabber ID</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_jid</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">2</property>
@@ -157,10 +172,13 @@
             <child>
               <object class="GtkLabel" id="label_email">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">E-_mail address:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">E-_mail address</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_email</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">1</property>
diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui
index 6561e5cb0..4b0614f33 100644
--- a/libempathy-gtk/empathy-account-widget-msn.ui
+++ b/libempathy-gtk/empathy-account-widget-msn.ui
@@ -19,9 +19,12 @@
         <child>
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -30,10 +33,13 @@
         <child>
           <object class="GtkLabel" id="label_id">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Login I_D</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_id</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
           </packing>
@@ -112,10 +118,13 @@
             <child>
               <object class="GtkLabel" id="label_port">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Port:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Port</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">spinbutton_port</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -124,10 +133,13 @@
             <child>
               <object class="GtkLabel" id="label_server">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Server:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Server</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_server</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 4104572d1..7caa7cad6 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -34,10 +34,13 @@
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Pass_word</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -56,10 +59,13 @@
           <object class="GtkLabel" id="label_userid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Username:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
+            <property name="mnemonic_widget">entry_userid</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -143,6 +149,7 @@
         <property name="can_focus">True</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="height_request">200</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
@@ -158,8 +165,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="border_width">6</property>
                     <child>
                       <object class="GtkGrid" id="grid_advanced_sip_settings">
                         <property name="visible">True</property>
@@ -272,7 +278,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">STUN Server:</property>
+                                <property name="label" translatable="yes">STUN Server</property>
                                 <property name="mnemonic_widget">entry_stun-server</property>
                               </object>
                             </child>
@@ -337,7 +343,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Server:</property>
+                                <property name="label" translatable="yes">Server</property>
                               </object>
                             </child>
                           </object>
@@ -371,7 +377,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Mechanism:</property>
+                                <property name="label" translatable="yes">Mechanism</property>
                               </object>
                             </child>
                           </object>
@@ -409,7 +415,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Authentication username:</property>
+                                <property name="label" translatable="yes">Authentication username</property>
                               </object>
                             </child>
                           </object>
@@ -428,7 +434,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Transport:</property>
+                                <property name="label" translatable="yes">Transport</property>
                               </object>
                             </child>
                           </object>
@@ -486,7 +492,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port:</property>
+                            <property name="label" translatable="yes">Port</property>
                             <property name="mnemonic_widget">spinbutton_stun-port</property>
                           </object>
                           <packing>
@@ -511,7 +517,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port:</property>
+                            <property name="label" translatable="yes">Port</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -540,7 +546,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Local IP Address:</property>
+                                <property name="label" translatable="yes">Local IP Address</property>
                                 <property name="mnemonic_widget">entry_local-ip-address</property>
                               </object>
                             </child>
@@ -555,7 +561,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port:</property>
+                            <property name="label" translatable="yes">Port</property>
                             <property name="mnemonic_widget">spinbutton_local-port</property>
                           </object>
                           <packing>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 96e6a8868..014d5a3db 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -762,9 +762,11 @@ accounts_widget_generic_setup (EmpathyAccountWidget *self,
         {
           gchar *str;
 
-          str = g_strdup_printf (_("%s:"), param_name_formatted);
+          str = g_strdup_printf (_("%s"), param_name_formatted);
           widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+          gtk_misc_set_alignment (GTK_MISC (widget), 1., 0.5);
+          gtk_style_context_add_class (gtk_widget_get_style_context (widget),
+              GTK_STYLE_CLASS_DIM_LABEL);
           g_free (str);
 
           gtk_grid_attach (GTK_GRID (grid_settings),
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 5a3658cd0..d28d980e5 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -119,8 +119,6 @@ struct _EmpathyContactWidgetPriv
   GtkWidget *groups_widget;
 
   /* Details */
-  GtkWidget *vbox_details;
-  GtkWidget *grid_details;
   GtkWidget *hbox_details_requested;
   GtkWidget *spinner_details;
   GList *details_to_set;
@@ -224,7 +222,7 @@ contact_widget_save (EmpathyContactWidget *self)
 static void
 contact_widget_details_setup (EmpathyContactWidget *self)
 {
-  gtk_widget_hide (self->priv->vbox_details);
+  gtk_widget_hide (self->priv->label_details);
 
   self->priv->spinner_details = gtk_spinner_new ();
   gtk_box_pack_end (GTK_BOX (self->priv->hbox_details_requested),
@@ -314,6 +312,30 @@ get_spec_from_list (GList *list,
   return NULL;
 }
 
+static void
+add_row (GtkGrid *grid,
+    GtkWidget *title,
+    GtkWidget *value)
+{
+  gtk_grid_attach_next_to (grid, title, NULL, GTK_POS_BOTTOM, 2, 1);
+  gtk_misc_set_alignment (GTK_MISC (title), 1, 0.5);
+  gtk_style_context_add_class (gtk_widget_get_style_context (title),
+      GTK_STYLE_CLASS_DIM_LABEL);
+  gtk_widget_show (title);
+
+  g_object_set_data (G_OBJECT (title), "added-row", (gpointer) TRUE);
+
+  gtk_grid_attach_next_to (grid, value, title, GTK_POS_RIGHT, 1, 1);
+  gtk_widget_set_hexpand (value, TRUE);
+
+  if (GTK_IS_MISC (value))
+    gtk_misc_set_alignment (GTK_MISC (value), 0, 0.5);
+
+  gtk_widget_show (value);
+
+  g_object_set_data (G_OBJECT (value), "added-row", (gpointer) TRUE);
+}
+
 static guint
 contact_widget_details_update_edit (EmpathyContactWidget *self)
 {
@@ -379,7 +401,7 @@ contact_widget_details_update_edit (EmpathyContactWidget *self)
   for (l = self->priv->details_to_set; l != NULL; l= g_list_next (l))
     {
       TpContactInfoField *field = l->data;
-      GtkWidget *w;
+      GtkWidget *label, *w;
       TpContactInfoFieldSpec *spec;
       gboolean has_field;
       char *title;
@@ -411,18 +433,12 @@ contact_widget_details_update_edit (EmpathyContactWidget *self)
       title = empathy_contact_info_field_label (field->field_name,
           field->parameters,
           (spec->flags & TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT));
-      w = gtk_label_new (title);
+      label = gtk_label_new (title);
       g_free (title);
 
       /* TODO: if TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT is not set we
        * should allow user to tag the vCard fields (bgo#672034) */
 
-      gtk_grid_attach (GTK_GRID (self->priv->grid_details),
-          w, 0, n_rows, 1, 1);
-
-      gtk_misc_set_alignment (GTK_MISC (w), 1, 0.5);
-      gtk_widget_show (w);
-
       /* Add Value */
       if (!tp_strdiff (field->field_name, "bday"))
         {
@@ -440,12 +456,6 @@ contact_widget_details_update_edit (EmpathyContactWidget *self)
                 }
             }
 
-          gtk_grid_attach (GTK_GRID (self->priv->grid_details),
-              w, 1, n_rows, 1, 1);
-          gtk_widget_show_all (w);
-
-          g_object_set_data ((GObject *) w, DATA_FIELD, field);
-
           g_signal_connect (w, "date-changed",
             G_CALLBACK (contact_widget_bday_changed_cb), self);
         }
@@ -454,16 +464,15 @@ contact_widget_details_update_edit (EmpathyContactWidget *self)
           w = gtk_entry_new ();
           gtk_entry_set_text (GTK_ENTRY (w),
               field->field_value[0] ? field->field_value[0] : "");
-          gtk_grid_attach (GTK_GRID (self->priv->grid_details),
-              w, 1, n_rows, 1, 1);
-          gtk_widget_show (w);
-
-          g_object_set_data ((GObject *) w, DATA_FIELD, field);
-
           g_signal_connect (w, "changed",
             G_CALLBACK (contact_widget_details_changed_cb), self);
         }
 
+      gtk_widget_show_all (w);
+      add_row (GTK_GRID (self->priv->grid_contact), label, w);
+
+      g_object_set_data ((GObject *) w, DATA_FIELD, field);
+
       n_rows++;
     }
 
@@ -473,21 +482,6 @@ contact_widget_details_update_edit (EmpathyContactWidget *self)
   return n_rows;
 }
 
-static void
-add_row (GtkGrid *grid,
-    guint row,
-    GtkWidget *title,
-    GtkWidget *value)
-{
-  gtk_grid_attach (grid, title, 0, row, 1, 1);
-  gtk_misc_set_alignment (GTK_MISC (title), 0, 0.5);
-  gtk_widget_show (title);
-
-  gtk_grid_attach (grid, value, 1, row, 1, 1);
-  gtk_misc_set_alignment (GTK_MISC (value), 0, 0.5);
-  gtk_widget_show (value);
-}
-
 static guint
 contact_widget_details_update_show (EmpathyContactWidget *self)
 {
@@ -548,7 +542,7 @@ contact_widget_details_update_show (EmpathyContactWidget *self)
       if ((self->priv->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP) == 0)
         gtk_label_set_selectable (GTK_LABEL (value_widget), TRUE);
 
-      add_row (GTK_GRID (self->priv->grid_details), n_rows, title_widget,
+      add_row (GTK_GRID (self->priv->grid_contact), title_widget,
           value_widget);
 
       n_rows++;
@@ -565,7 +559,7 @@ contact_widget_details_update_show (EmpathyContactWidget *self)
 
       title_widget =  gtk_label_new (_("Channels:"));
 
-      add_row (GTK_GRID (self->priv->grid_details), n_rows, title_widget,
+      add_row (GTK_GRID (self->priv->grid_contact), title_widget,
           channels_label);
 
       n_rows++;
@@ -577,27 +571,27 @@ contact_widget_details_update_show (EmpathyContactWidget *self)
 }
 
 static void
+contact_widget_foreach (GtkWidget *widget,
+    gpointer data)
+{
+  if (g_object_get_data (G_OBJECT (widget), "added-row") != NULL)
+    gtk_widget_destroy (widget);
+}
+
+static void
 contact_widget_details_notify_cb (EmpathyContactWidget *self)
 {
   guint n_rows;
 
-  gtk_container_foreach (GTK_CONTAINER (self->priv->grid_details),
-      (GtkCallback) gtk_widget_destroy, NULL);
+  gtk_container_foreach (GTK_CONTAINER (self->priv->grid_contact),
+      contact_widget_foreach, NULL);
 
   if ((self->priv->flags & EMPATHY_CONTACT_WIDGET_EDIT_DETAILS) != 0)
     n_rows = contact_widget_details_update_edit (self);
   else
     n_rows = contact_widget_details_update_show (self);
 
-  if (n_rows > 0)
-    {
-      gtk_widget_show (self->priv->vbox_details);
-      gtk_widget_show (self->priv->grid_details);
-    }
-  else
-    {
-      gtk_widget_hide (self->priv->vbox_details);
-    }
+  gtk_widget_set_visible (self->priv->label_details, n_rows > 0);
 
   gtk_widget_hide (self->priv->hbox_details_requested);
   gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_details));
@@ -622,7 +616,7 @@ contact_widget_details_request_cb (GObject *object,
           return;
         }
 
-      gtk_widget_hide (self->priv->vbox_details);
+      gtk_widget_hide (self->priv->label_details);
       g_clear_error (&error);
     }
   else
@@ -650,7 +644,7 @@ fetch_contact_information (EmpathyContactWidget *self,
   if (!tp_proxy_has_interface_by_id (connection,
           TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO))
     {
-      gtk_widget_hide (self->priv->vbox_details);
+      gtk_widget_hide (self->priv->label_details);
       return;
     }
 
@@ -659,14 +653,12 @@ fetch_contact_information (EmpathyContactWidget *self,
   if ((flags & TP_CONTACT_INFO_FLAG_CAN_SET) == 0 &&
       (self->priv->flags & EMPATHY_CONTACT_WIDGET_EDIT_DETAILS) != 0)
     {
-      gtk_widget_hide (self->priv->vbox_details);
+      gtk_widget_hide (self->priv->label_details);
       return;
     }
 
   /* Request the contact's info */
-  gtk_widget_show (self->priv->vbox_details);
   gtk_widget_show (self->priv->hbox_details_requested);
-  gtk_widget_hide (self->priv->grid_details);
   gtk_spinner_start (GTK_SPINNER (self->priv->spinner_details));
 
   contact = empathy_contact_get_tp_contact (self->priv->contact);
@@ -686,7 +678,7 @@ contact_widget_details_update (EmpathyContactWidget *self)
       (self->priv->flags & EMPATHY_CONTACT_WIDGET_EDIT_DETAILS) == 0)
     return;
 
-  gtk_widget_hide (self->priv->vbox_details);
+  gtk_widget_hide (self->priv->label_details);
 
   if (self->priv->contact != NULL)
     tp_contact = empathy_contact_get_tp_contact (self->priv->contact);
@@ -1642,7 +1634,7 @@ contact_widget_contact_setup (EmpathyContactWidget *self)
     {
       gtk_grid_attach (GTK_GRID (self->priv->grid_contact),
           self->priv->widget_account,
-          1, 0, 1, 1);
+          2, 0, 1, 1);
 
       gtk_widget_show (self->priv->widget_account);
     }
@@ -1701,7 +1693,8 @@ contact_widget_contact_setup (EmpathyContactWidget *self)
     }
 
   gtk_grid_attach (GTK_GRID (self->priv->grid_contact), self->priv->widget_id,
-      1, 1, 1, 1);
+      2, 1, 1, 1);
+  gtk_widget_set_hexpand (self->priv->widget_id, TRUE);
 
   gtk_widget_show (self->priv->widget_id);
 
@@ -1729,7 +1722,8 @@ contact_widget_contact_setup (EmpathyContactWidget *self)
     }
 
   gtk_grid_attach (GTK_GRID (self->priv->grid_contact),
-      self->priv->widget_alias, 1, 2, 1, 1);
+      self->priv->widget_alias, 2, 2, 1, 1);
+  gtk_widget_set_hexpand (self->priv->widget_alias, TRUE);
 
   if (self->priv->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP) {
     gtk_label_set_selectable (GTK_LABEL (self->priv->label_status), FALSE);
@@ -1796,8 +1790,6 @@ empathy_contact_widget_new (EmpathyContact *contact,
        "viewport_map", &self->priv->viewport_map,
 #endif
        "groups_widget", &self->priv->groups_widget,
-       "vbox_details", &self->priv->vbox_details,
-       "grid_details", &self->priv->grid_details,
        "hbox_details_requested", &self->priv->hbox_details_requested,
        "vbox_client", &self->priv->vbox_client,
        "grid_client", &self->priv->grid_client,
diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 0954ac7d3..b27389818 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -1,51 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkVBox" id="vbox_contact_widget">
+    <property name="can_focus">False</property>
     <property name="spacing">6</property>
     <child>
-    <object class="GtkGrid" id="grid_contact">
+      <object class="GtkGrid" id="grid_contact">
         <property name="visible">True</property>
-        <property name="column_spacing">6</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkLabel" id="label_left_account">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Account:</property>
+            <property name="label" translatable="yes">Account</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label655">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property>
+            <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
+            <property name="left_attach">1</property>
             <property name="top_attach">1</property>
-            <property name="left_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_alias">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">1</property>
-            <property name="label" translatable="yes">Alias:</property>
+            <property name="label" translatable="yes">Alias</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
+            <property name="left_attach">1</property>
             <property name="top_attach">2</property>
-            <property name="left_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkHBox" id="hbox_presence">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image_state">
+                <property name="can_focus">False</property>
                 <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
@@ -56,37 +80,78 @@
             </child>
           </object>
           <packing>
+            <property name="left_attach">1</property>
             <property name="top_attach">3</property>
-            <property name="left_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox_avatar">
-                    <property name="visible">True</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="top-attach">0</property>
-                    <property name="left-attach">2</property>
-                    <property name="height">3</property>
-                  </packing>
-                </child>
-              </object>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_details">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Contact Details</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox_location">
+      <object class="GtkHBox" id="hbox_details_requested">
+        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label_location">
+          <object class="GtkImage" id="image885">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Location&lt;/b&gt; at (date)	</property>
-            <property name="use_markup">True</property>
+            <property name="can_focus">False</property>
+            <property name="stock">gtk-dialog-info</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -95,62 +160,38 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment1">
+          <object class="GtkLabel" id="label653">
             <property name="visible">True</property>
-            <property name="left_padding">12</property>
-            <child>
-              <object class="GtkVBox" id="subvbox_location">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="viewport_map">
-                    <property name="height_request">150</property>
-                    <property name="resize_mode">queue</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Information requested…</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="EmpathyGroupsWidget" id="groups_widget"/>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox_details">
+      <object class="GtkVBox" id="vbox_location">
+        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label_details">
+          <object class="GtkLabel" id="label_location">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Contact Details</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <property name="label" translatable="yes">&lt;b&gt;Location&lt;/b&gt; at (date)	</property>
+            <property name="use_markup">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -159,53 +200,32 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment30">
+          <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkVBox" id="vbox218">
+              <object class="GtkVBox" id="subvbox_location">
                 <property name="visible">True</property>
-                <property name="spacing">6</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
                 <child>
-                  <object class="GtkGrid" id="grid_details">
-                    <property name="visible">True</property>
-                    <property name="column_spacing">12</property>
-                    <property name="row_spacing">6</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
+                  <placeholder/>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox_details_requested">
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage" id="image885">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-dialog-info</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                  <object class="GtkFrame" id="viewport_map">
+                    <property name="height_request">150</property>
+                    <property name="can_focus">False</property>
+                    <property name="resize_mode">queue</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkLabel" id="label653">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Information requested…</property>
-                        <property name="use_markup">True</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -221,15 +241,26 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="EmpathyGroupsWidget" id="groups_widget"/>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">3</property>
       </packing>
     </child>
     <child>
       <object class="GtkVBox" id="vbox_client">
+        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="label662">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Client Information</property>
             <attributes>
@@ -245,46 +276,71 @@
         <child>
           <object class="GtkAlignment" id="alignment32">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="left_padding">12</property>
             <child>
               <object class="GtkVBox" id="vbox222">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid_client">
                     <property name="visible">True</property>
-                    <property name="column_spacing">12</property>
+                    <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label668">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">OS:</property>
+                        <property name="label" translatable="yes">OS</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label667">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Version:</property>
+                        <property name="label" translatable="yes">Version</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label666">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Client:</property>
+                        <property name="label" translatable="yes">Client</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
+                        <property name="left_attach">4</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -298,6 +354,9 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -312,6 +371,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -326,20 +387,52 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hbox_client_requested">
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image887">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="stock">gtk-dialog-info</property>
                       </object>
                       <packing>
@@ -351,12 +444,15 @@
                     <child>
                       <object class="GtkLabel" id="label669">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Information requested…</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -379,6 +475,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">4</property>
       </packing>
     </child>
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 270566721..67186d2a9 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -227,9 +227,9 @@ empathy_contact_info_field_label (const char *field_name,
     join = build_parameters_string (parameters);
 
   if (join != NULL)
-    ret = g_strdup_printf ("%s (%s):", title, join);
+    ret = g_strdup_printf ("%s (%s)", title, join);
   else
-    ret = g_strdup_printf ("%s:", title);
+    ret = g_strdup_printf ("%s", title);
 
   g_free (join);