diff --git a/gajim/data/gui/manage_bookmarks_window.ui b/gajim/data/gui/manage_bookmarks_window.ui
index 87f015e99..7e30ef7b8 100644
--- a/gajim/data/gui/manage_bookmarks_window.ui
+++ b/gajim/data/gui/manage_bookmarks_window.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.18"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name item -->
@@ -22,10 +22,7 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">18</property>
-        <property name="margin_right">18</property>
-        <property name="margin_top">18</property>
-        <property name="margin_bottom">18</property>
+        <property name="border_width">18</property>
         <property name="spacing">18</property>
         <child>
           <object class="GtkBox">
@@ -68,6 +65,7 @@
                   <object class="GtkToolButton" id="add_bookmark_button">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Add Bookmark</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">list-add-symbolic</property>
                     <signal name="clicked" handler="on_add_bookmark_button_clicked" swapped="no"/>
@@ -81,6 +79,7 @@
                   <object class="GtkToolButton" id="remove_bookmark_button">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Remove Bookmark</property>
                     <property name="use_underline">True</property>
                     <property name="icon_name">list-remove-symbolic</property>
                     <signal name="clicked" handler="on_remove_bookmark_button_clicked" swapped="no"/>
@@ -117,16 +116,16 @@
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">6</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="label325">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes">Name</property>
+                    <property name="label" translatable="yes">N_ame</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">title_entry</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
@@ -153,13 +152,14 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label317">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
                     <property name="margin_top">12</property>
                     <property name="label" translatable="yes">_Server</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">server_entry</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
@@ -184,13 +184,14 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label315">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
                     <property name="margin_top">12</property>
                     <property name="label" translatable="yes">_Nickname</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">nick_entry</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
@@ -215,12 +216,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label316">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">Roo_m</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">room_entry</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
@@ -244,12 +246,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label318">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">_Password</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">pass_entry</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="dim-label"/>
@@ -301,7 +304,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Auto Join</property>
+                            <property name="label" translatable="yes">_Join Automatically</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">autojoin_checkbutton</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>