diff --git a/GTG/plugins/export/export.py b/GTG/plugins/export/export.py
index 40a8d4cb29..b028c5de80 100644
--- a/GTG/plugins/export/export.py
+++ b/GTG/plugins/export/export.py
@@ -88,7 +88,6 @@ class ExportPlugin():
 
     DEFAULT_PREFERENCES = {
         "menu_entry": True,
-        "toolbar_entry": True,
         "last_template": None,
     }
 
@@ -180,16 +179,11 @@ def get_selected_tasks(self):
     def _init_gtk(self):
         """ Initialize all the GTK widgets """
         self.menu_entry = False
-        self.toolbar_entry = False
 
         self.menu_item = Gtk.MenuItem(_("Export the tasks currently listed"))
         self.menu_item.connect('activate', self.show_dialog)
         self.menu_item.show()
 
-        self.tb_button = Gtk.ToolButton(Gtk.STOCK_PRINT)
-        self.tb_button.connect('clicked', self.show_dialog)
-        self.tb_button.show()
-
         builder = Gtk.Builder()
         cur_dir = os.path.dirname(os.path.abspath(__file__))
         builder_file = os.path.join(cur_dir, "export.ui")
@@ -208,7 +202,6 @@ def _init_gtk(self):
         self.export_image = builder.get_object("export_image")
         self.preferences_dialog = builder.get_object("preferences_dialog")
         self.pref_menu = builder.get_object("pref_chbox_menu")
-        self.pref_toolbar = builder.get_object("pref_chbox_toolbar")
         self.description_label = builder.get_object("label_description")
         self.save_button = builder.get_object("export_btn_save")
         self.open_button = builder.get_object("export_btn_open")
@@ -239,15 +232,11 @@ def _init_gtk(self):
         })
 
     def _gtk_deactivate(self):
-        """ Remove Toolbar Button and Menu item for this plugin """
+        """ Remove Menu item for this plugin """
         if self.menu_entry:
             self.plugin_api.remove_menu_item(self.menu_item)
             self.menu_entry = False
 
-        if self.toolbar_entry:
-            self.plugin_api.remove_toolbar_item(self.tb_button)
-            self.toolbar_entry = False
-
     def show_dialog(self, widget):
         """ Show dialog with options for export """
         parent_window = self.plugin_api.get_ui().get_window()
@@ -349,7 +338,6 @@ def configure_dialog(self, manager_dialog):
         self._preferences_load()
         self.preferences_dialog.set_transient_for(manager_dialog)
         self.pref_menu.set_active(self.preferences["menu_entry"])
-        self.pref_toolbar.set_active(self.preferences["toolbar_entry"])
         self.preferences_dialog.show_all()
 
     def on_preferences_cancel(self, widget, data=None):
@@ -361,7 +349,6 @@ def on_preferences_cancel(self, widget, data=None):
     def on_preferences_ok(self, widget):
         """ Apply and store new preferences """
         self.preferences["menu_entry"] = self.pref_menu.get_active()
-        self.preferences["toolbar_entry"] = self.pref_toolbar.get_active()
         self.preferences_dialog.hide()
 
         self._preferences_apply()
@@ -379,17 +366,11 @@ def _preferences_store(self):
             self.PLUGIN_NAME, "preferences", self.preferences)
 
     def _preferences_apply(self):
-        """ Add/remove menu entry/toolbar entry """
+        """ Add/remove menu entry """
         if self.preferences["menu_entry"] and not self.menu_entry:
             self.plugin_api.add_menu_item(self.menu_item)
             self.menu_entry = True
+
         elif not self.preferences["menu_entry"] and self.menu_entry:
             self.plugin_api.remove_menu_item(self.menu_item)
             self.menu_entry = False
-
-        if self.preferences["toolbar_entry"] and not self.toolbar_entry:
-            self.plugin_api.add_toolbar_item(self.tb_button)
-            self.toolbar_entry = True
-        elif not self.preferences["toolbar_entry"] and self.toolbar_entry:
-            self.plugin_api.remove_toolbar_item(self.tb_button)
-            self.toolbar_entry = False
diff --git a/GTG/plugins/export/export.ui b/GTG/plugins/export/export.ui
index 67cd758cf5..62ca06cc4c 100644
--- a/GTG/plugins/export/export.ui
+++ b/GTG/plugins/export/export.ui
@@ -1,43 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.2 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkWindow" id="export_dialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Export tasks</property>
     <property name="window_position">mouse</property>
     <property name="destroy_with_parent">True</property>
-    <signal name="delete_event" handler="on_export_dialog_delete_event"/>
+    <signal name="delete-event" handler="on_export_dialog_delete_event" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox3">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="box11">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">15</property>
             <property name="spacing">15</property>
             <child>
               <object class="GtkBox" id="vbox111">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="vbox44444444444">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="label1ewegwegewg">
                         <property name="visible">True</property>
-                        <property name="halign">GTK_ALIGN_START</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
                         <property name="label" translatable="yes">&lt;b&gt;Which tasks do you want to export?&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="vbox1342342243">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkRadioButton" id="export_all_active_rb">
@@ -51,6 +64,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -65,6 +79,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -79,45 +94,54 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox1343">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_top">20</property>
                     <property name="orientation">vertical</property>
-                    <property name="margin-top">20</property>
                     <child>
                       <object class="GtkLabel" id="label1lalalla">
                         <property name="visible">True</property>
-                        <property name="halign">GTK_ALIGN_START</property>
-                        <property name="valign">GTK_ALIGN_START</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="valign">start</property>
                         <property name="label" translatable="yes">&lt;b&gt;Select a format for your tasks&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkComboBox" id="export_combo_templ">
                         <property name="visible">True</property>
-                        <signal name="changed" handler="on_export_combo_templ_changed"/>
+                        <property name="can_focus">False</property>
+                        <signal name="changed" handler="on_export_combo_templ_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="padding">10</property>
                         <property name="position">1</property>
                       </packing>
@@ -125,9 +149,9 @@
                     <child>
                       <object class="GtkLabel" id="label_description">
                         <property name="visible">True</property>
-                        <property name="halign">GTK_ALIGN_START</property>
-                        <property name="valign">GTK_ALIGN_START</property>
-                        <property name="margin">10</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="valign">start</property>
                         <property name="use_markup">True</property>
                         <property name="justify">fill</property>
                         <property name="wrap">True</property>
@@ -135,16 +159,22 @@
                         <property name="width_chars">30</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -153,13 +183,18 @@
                 <property name="width_request">300</property>
                 <property name="height_request">350</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -167,6 +202,7 @@
           <object class="GtkBox" id="buttonbox">
             <property name="height_request">50</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="spacing">23</property>
             <child>
@@ -175,9 +211,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_export_btn_open_clicked"/>
+                <signal name="clicked" handler="on_export_btn_open_clicked" swapped="no"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -187,14 +225,18 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_export_btn_save_clicked"/>
+                <signal name="clicked" handler="on_export_btn_save_clicked" swapped="no"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -202,28 +244,37 @@
     </child>
   </object>
   <object class="GtkWindow" id="preferences_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">10</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <signal name="delete_event" handler="on_preferences_dialog_delete_event"/>
+    <signal name="delete-event" handler="on_preferences_dialog_delete_event" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="margin-bottom">7</property>
-            <property name="margin-top">7</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">7</property>
+            <property name="margin_bottom">7</property>
             <property name="label" translatable="yes">How do you want to access the export plugin?</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkCheckButton" id="pref_chbox_menu">
@@ -235,23 +286,15 @@
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkCheckButton" id="pref_chbox_toolbar">
-                <property name="label" translatable="yes">Put an icon in the Toolbar</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -259,6 +302,7 @@
           <object class="GtkBox" id="box1">
             <property name="height_request">30</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">50</property>
             <child>
               <object class="GtkButton" id="btn_preferences_cancel">
@@ -266,9 +310,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_btn_preferences_cancel_clicked"/>
+                <signal name="clicked" handler="on_btn_preferences_cancel_clicked" swapped="no"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -278,14 +324,18 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_btn_preferences_ok_clicked"/>
+                <signal name="clicked" handler="on_btn_preferences_ok_clicked" swapped="no"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>