diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index 4473bd9..2971482 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -29,76 +29,12 @@ class mintMenuConfig(object):
         self.builder = Gtk.Builder()
 
         self.builder.add_from_file(os.path.join(self.path, "mintMenuConfig.glade"))
-        self.mainWindow=self.builder.get_object("mainWindow")
+        self.mainWindow = self.builder.get_object("mainWindow")
 
         #i18n
         self.mainWindow.set_title(_("Menu preferences"))
         self.mainWindow.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg")
 
-        self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
-        self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
-        self.builder.get_object("enableInternetSearch").set_label(_("Enable Internet search"))
-        self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
-        self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
-        self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))
-        self.builder.get_object("showSystemPlugin").set_label(_("Show system plugin"))
-        self.builder.get_object("showPlacesPlugin").set_label(_("Show places plugin"))
-
-        self.builder.get_object("showAppComments").set_label(_("Show application comments"))
-        self.builder.get_object("showCategoryIcons").set_label(_("Show category icons"))
-        self.builder.get_object("hover").set_label(_("Hover"))
-        self.builder.get_object("remember_filter").set_label(_("Remember the last category or search"))
-        self.builder.get_object("use_apt").set_label(_("Search for packages to install"))
-        self.builder.get_object("swapGeneric").set_label(_("Swap name and generic name"))
-
-        self.builder.get_object("buttonTextLabel").set_text(_("Button text:"))
-        self.builder.get_object("label1").set_text(_("Options"))
-        self.builder.get_object("applicationsLabel").set_text(_("Applications"))
-
-        self.builder.get_object("colorsLabel").set_text(_("Theme"))
-        self.builder.get_object("favLabel").set_text(_("Favorites"))
-        self.builder.get_object("mainbuttonLabel").set_text(_("Main button"))
-        self.builder.get_object("pluginsLabel").set_text(_("Plugins"))
-
-        self.builder.get_object("backgroundColorLabel").set_text(_("Background:"))
-        self.builder.get_object("headingColorLabel").set_text(_("Headings:"))
-        self.builder.get_object("themeLabel").set_text(_("Theme:"))
-
-        #self.builder.get_object("applicationsLabel").set_text(_("Applications"))
-        #self.builder.get_object("favoritesLabel").set_text(_("Favorites"))
-        self.builder.get_object("numberColumnsLabel").set_text(_("Number of columns:"))
-        self.builder.get_object("iconSizeLabel").set_text(_("Icon size:"))
-        self.builder.get_object("iconSizeLabel2").set_text(_("Icon size:"))
-        self.builder.get_object("placesIconSizeLabel").set_text(_("Icon size:"))
-        self.builder.get_object("systemIconSizeLabel").set_text(_("Icon size:"))
-        self.builder.get_object("hoverLabel").set_text(_("Hover delay (ms):"))
-        self.builder.get_object("label4").set_text(_("Button icon:"))
-        self.builder.get_object("label5").set_text(_("Search command:"))
-
-        self.builder.get_object("placesLabel").set_text(_("Places"))
-        self.builder.get_object("allowscrollbarcheckbutton").set_label(_("Allow Scrollbar"))
-        self.builder.get_object("showgtkbookmarkscheckbutton").set_label(_("Show GTK Bookmarks"))
-        self.builder.get_object("placesHeightEntryLabel").set_text(_("Height:"))
-        self.builder.get_object("defaultPlacesFrameLabel").set_text(_("Toggle Default Places:"))
-        self.builder.get_object("computercheckbutton").set_label(_("Computer"))
-        self.builder.get_object("homecheckbutton").set_label(_("Home Folder"))
-        self.builder.get_object("networkcheckbutton").set_label(_("Network"))
-        self.builder.get_object("desktopcheckbutton").set_label(_("Desktop"))
-        self.builder.get_object("trashcheckbutton").set_label(_("Trash"))
-        self.builder.get_object("customPlacesFrameLabel").set_text(_("Custom Places:"))
-
-        self.builder.get_object("systemLabel").set_text(_("System"))
-        self.builder.get_object("allowscrollbarcheckbutton1").set_label(_("Allow Scrollbar"))
-        self.builder.get_object("systemHeightEntryLabel").set_text(_("Height:"))
-        self.builder.get_object("defaultItemsFrameLabel").set_text(_("Toggle Default Items:"))
-        self.builder.get_object("softwaremanagercheckbutton").set_label(_("Software Manager"))
-        self.builder.get_object("packagemanagercheckbutton").set_label(_("Package Manager"))
-        self.builder.get_object("controlcentercheckbutton").set_label(_("Control Center"))
-        self.builder.get_object("terminalcheckbutton").set_label(_("Terminal"))
-        self.builder.get_object("lockcheckbutton").set_label(_("Lock Screen"))
-        self.builder.get_object("logoutcheckbutton").set_label(_("Log Out"))
-        self.builder.get_object("quitcheckbutton").set_label(_("Quit"))
-
         self.editPlaceDialogTitle = _("Edit Place")
         self.newPlaceDialogTitle = _("New Place")
         self.folderChooserDialogTitle = _("Select a folder")
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
index 9722395..db78884 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="mainWindow">
@@ -8,6 +9,9 @@
     <property name="window_position">mouse</property>
     <property name="gravity">static</property>
     <signal name="destroy" handler="on_window1_destroy" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkEventBox" id="Applications">
         <property name="visible">True</property>
@@ -42,7 +46,7 @@
                             <property name="can_focus">False</property>
                             <property name="xpad">15</property>
                             <property name="ypad">10</property>
-                            <property name="label" translatable="yes">&lt;span weight="bold"&gt;Favorites&lt;/span&gt;</property>
+                            <property name="label" translatable="yes">Favorites</property>
                             <property name="use_markup">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -70,7 +74,7 @@
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">All _Applications</property>
+                                    <property name="label" translatable="yes">All applications</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -128,6 +132,30 @@
                             <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>
@@ -160,7 +188,7 @@
                             <property name="can_focus">False</property>
                             <property name="xpad">15</property>
                             <property name="ypad">10</property>
-                            <property name="label" translatable="yes">&lt;span weight="bold"&gt;All Applications&lt;/span&gt;</property>
+                            <property name="label" translatable="yes">Applications</property>
                             <property name="use_markup">True</property>
                             <property name="xalign">0</property>
                           </object>
@@ -188,7 +216,7 @@
                                   <object class="GtkLabel" id="label3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Favorites</property>
+                                    <property name="label" translatable="yes">Favorites</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                   <packing>
@@ -328,7 +356,6 @@
             </child>
             <child>
               <object class="GtkBox" id="hbox9">
-                <property name="width_request">227</property>
                 <property name="height_request">30</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -374,6 +401,7 @@
                     <property name="can_default">True</property>
                     <property name="has_default">True</property>
                     <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Show additional search options</property>
                     <property name="relief">none</property>
                     <signal name="clicked" handler="on_button17_clicked" swapped="no"/>
                     <child>
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 5c2dbd6..ffc8fbe 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -177,16 +177,6 @@ class pluginclass(object):
         self.favoritesBox =self.builder.get_object("favoritesBox")
         self.applicationsScrolledWindow =self.builder.get_object("applicationsScrolledWindow")
 
-        #i18n
-        self.builder.get_object("searchLabel").set_text("<span weight='bold'>" + _("Search:") + "</span>")
-        self.builder.get_object("searchLabel").set_use_markup(True)
-        self.builder.get_object("label6").set_text(_("Favorites"))
-        self.builder.get_object("label3").set_text(_("Favorites"))
-        self.builder.get_object("label7").set_text(_("All applications"))
-        self.builder.get_object("label2").set_text(_("Applications"))
-
-        self.headingstocolor = [self.builder.get_object("label6"),self.builder.get_object("label2")]
-
         self.numApps = 0
         # These properties are NECESSARY to maintain consistency
 
@@ -238,6 +228,7 @@ class pluginclass(object):
             self.settings.bindGSettingsEntryToVar("int", "default-tab", self, "defaultTab")
         except Exception as e:
             print(e)
+
         self.currentFavCol = 0
         self.favorites = []