diff --git a/debian/changelog b/debian/changelog
index 90573dd..bfc7d00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mintmenu (4.9.7) isadora; urgency=low
+
+  * Imported fixes from icius on editing favorites
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue,  27 Apr 2010 08:37:00 +0000
+
 mintmenu (4.9.6) isadora; urgency=low
 
   * Fixed drag and drop from favorites
diff --git a/mintmenu.pot b/mintmenu.pot
index 2f15d92..2749017 100644
--- a/mintmenu.pot
+++ b/mintmenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-16 14:53+0000\n"
+"POT-Creation-Date: 2010-04-27 08:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,7 +142,7 @@ msgid "Options"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:64
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:243
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:244
 msgid "Applications"
 msgstr ""
 
@@ -151,8 +151,8 @@ msgid "Colors"
 msgstr ""
 
 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:67
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:229
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:234
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:230
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:235
 msgid "Favorites"
 msgstr ""
 
@@ -323,104 +323,105 @@ msgstr ""
 msgid "Recent documents"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:227
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:228
 msgid "Filter:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:231
 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:232
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:233
 msgid "All applications"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:631
 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:632
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:633
 #, python-format
 msgid "Search portal for '%s'"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:635
 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:636
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:637
 #, python-format
 msgid "Search repositories for '%s'"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:639
 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:640
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:641
 #, python-format
 msgid "Show package '%s'"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:643
 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:644
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:645
 #, python-format
 msgid "Install package '%s'"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:696
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:756
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:697
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:762
 msgid "Add to desktop"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:697
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:757
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:698
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:763
 msgid "Add to panel"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:699
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:739
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:700
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:745
 msgid "Insert space"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:700
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:740
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:701
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:746
 msgid "Insert separator"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:702
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:760
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:703
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:766
 msgid "Launch when I log in"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:704
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:762
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:705
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:768
 msgid "Launch"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:705
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:706
 msgid "Remove from favorites"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:738
-msgid "Remove"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:759
-msgid "Show in my favorites"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:763
-msgid "Uninstall"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:764
-msgid "Delete from menu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:766
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:708
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:772
 msgid "Edit properties"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1192
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:744
+msgid "Remove"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:765
+msgid "Show in my favorites"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:769
+msgid "Uninstall"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:770
+msgid "Delete from menu"
+msgstr ""
+
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1225
 msgid ""
 "Couldn't save favorites. Check if you have write access to ~/.linuxmint/"
 "mintMenu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1375
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1408
 msgid "All"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1375
+#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1408
 msgid "Show all applications"
 msgstr ""
 
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
index 5ff23da..ecc2902 100644
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.glade
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.glade
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainWindow">
     <property name="width_request">169</property>
     <property name="height_request">227</property>
-    <property name="window_position">GTK_WIN_POS_MOUSE</property>
-    <property name="gravity">GDK_GRAVITY_STATIC</property>
+    <property name="window_position">mouse</property>
+    <property name="gravity">static</property>
     <signal name="destroy" handler="on_window1_destroy"/>
     <child>
       <widget class="GtkEventBox" id="Applications">
@@ -46,8 +46,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
+                            <property name="receives_default">False</property>
+                            <property name="relief">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
@@ -65,6 +65,9 @@
                                         <property name="label" translatable="yes">All _Applications</property>
                                         <property name="use_underline">True</property>
                                       </widget>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkImage" id="image4">
@@ -83,7 +86,7 @@
                           </widget>
                           <packing>
                             <property name="padding">5</property>
-                            <property name="pack_type">GTK_PACK_END</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -91,20 +94,19 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkViewport" id="viewport2">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="resize_mode">GTK_RESIZE_QUEUE</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="resize_mode">queue</property>
+                        <property name="shadow_type">none</property>
                         <child>
                           <widget class="GtkTable" id="favoritesBox">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="n_rows">1</property>
-                            <property name="n_columns">1</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -148,8 +150,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
+                            <property name="receives_default">False</property>
+                            <property name="relief">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment2">
                                 <property name="visible">True</property>
@@ -167,6 +169,9 @@
                                         <property name="label" translatable="yes">_Favorites</property>
                                         <property name="use_underline">True</property>
                                       </widget>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkImage" id="image3">
@@ -185,7 +190,7 @@
                           </widget>
                           <packing>
                             <property name="padding">5</property>
-                            <property name="pack_type">GTK_PACK_END</property>
+                            <property name="pack_type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -193,6 +198,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -202,12 +208,12 @@
                           <widget class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <widget class="GtkViewport" id="viewport1">
                                 <property name="visible">True</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <widget class="GtkVBox" id="categoriesBox">
                                     <property name="visible">True</property>
@@ -216,6 +222,9 @@
                               </widget>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkVSeparator" id="vseparator1">
@@ -232,13 +241,14 @@
                         <child>
                           <widget class="GtkScrolledWindow" id="applicationsScrolledWindow">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="can_focus">False</property>
+                            <property name="can_default">True</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <widget class="GtkViewport" id="viewport3">
                                 <property name="visible">True</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <widget class="GtkVBox" id="applicationsBox">
                                     <property name="visible">True</property>
@@ -268,6 +278,9 @@
                   </packing>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkHBox" id="hbox9">
@@ -284,6 +297,7 @@
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="padding">5</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -307,8 +321,8 @@
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="has_default">True</property>
+                    <property name="receives_default">False</property>
                     <property name="focus_on_click">False</property>
-                    <property name="response_id">0</property>
                     <signal name="clicked" handler="on_button17_clicked"/>
                     <child>
                       <widget class="GtkImage" id="image1">
@@ -317,14 +331,14 @@
                         <property name="can_default">True</property>
                         <property name="has_default">True</property>
                         <property name="stock">gtk-find</property>
-                        <property name="icon_size">1</property>
+                        <property name="icon-size">1</property>
                       </widget>
                     </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="pack_type">GTK_PACK_END</property>
+                    <property name="pack_type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -332,7 +346,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -341,8 +355,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="GtkMenu" id="applicationsMenu">
-  </widget>
+  <widget class="GtkMenu" id="applicationsMenu"/>
   <widget class="GtkMenu" id="favoritesMenu">
     <property name="visible">True</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>