diff --git a/data/gupnp-av-cp.ui.in b/data/gupnp-av-cp.ui.in
index 39cec79..91afb57 100644
--- a/data/gupnp-av-cp.ui.in
+++ b/data/gupnp-av-cp.ui.in
@@ -164,7 +164,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="label" translatable="yes">Lenient Mode</property>
+                        <property name="label" translatable="yes">_Lenient Mode</property>
                         <property name="use_underline">True</property>
                       </object>
                     </child>
@@ -344,7 +344,9 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Renderer: </property>
+                    <property name="label" translatable="yes">_Renderer: </property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">renderer-combobox</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -369,7 +371,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text">Clears the CP's idea of the state of the currently selected AV Renderer. Useful for dealing with AV Renderers that don't report state changes.</property>
+                    <property name="tooltip_text" translatable="yes">Clears the CP's idea of the state of the currently selected AV Renderer. Useful for dealing with AV Renderers that don't report state changes.</property>
                     <property name="use_action_appearance">False</property>
                     <signal name="clicked" handler="on_clear_state_button_clicked" swapped="no"/>
                     <child>
@@ -399,7 +401,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Clear state</property>
+                                <property name="label" translatable="yes">_Clear state</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -466,7 +468,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Play</property>
+                                <property name="label" translatable="yes">_Play</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -521,7 +523,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Pause</property>
+                                <property name="label" translatable="yes">P_ause</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -576,7 +578,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label10">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Stop</property>
+                                <property name="label" translatable="yes">_Stop</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -631,7 +633,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label11">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Previous</property>
+                                <property name="label" translatable="yes">Pre_vious</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
@@ -686,7 +688,7 @@ Vinicius Depizzol &lt;vdepizzol@gmail.com&gt;</property>
                               <object class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Next</property>
+                                <property name="label" translatable="yes">_Next</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
