diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po
index fcfe08ad585..b214f1f2b25 100644
--- a/bin/addons/base/i18n/fr_FR.po
+++ b/bin/addons/base/i18n/fr_FR.po
@@ -680,7 +680,7 @@ msgstr "Facteur"
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr "%B - Nomd u mois complet."
+msgstr "%B - Nom du mois complet."
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 5715fc9ac78..75a3550250e 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -233,7 +233,7 @@ class ir_ui_menu(osv.osv):
         'complete_name': fields.function(_get_full_name, method=True,
             string='Complete Name', type='char', size=128),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
-        'icon_pict': fields.function(_get_icon_pict, method=True, type='picture'),
+        'icon_pict': fields.function(_get_icon_pict, method=True, type='char', size=32),
         'action': fields.function(_action, fnct_inv=_action_inv,
             method=True, type='reference', string='Action',
             selection=[
diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py
index 1fc63572a0f..db6a1ea511c 100644
--- a/bin/report/render/html2html/html2html.py
+++ b/bin/report/render/html2html/html2html.py
@@ -74,11 +74,15 @@ class html2html(object):
         
     def url_modify(self,root):
         for n in root.getchildren():
-            if n.text.find('<a ')>=0 and n.text.find('style')<=0 :
+            if (n.text.find('<a ')>=0 or n.text.find('&lt;a')>=0) and n.text.find('href')>=0 and n.text.find('style')<=0 :
                 node = (n.tag=='span' and n.getparent().tag=='u') and n.getparent().getparent() or ((n.tag=='span') and n.getparent()) or n
                 style = node.get('color') and "style='color:%s; text-decoration: none;'"%node.get('color') or ''
-                href = n.text.split('<a ')[-1]
-                n.text = ' '.join(['<a ',style,href])
+                if n.text.find('&lt;a')>=0:
+                    t = '&lt;a '
+                else :
+                    t = '<a '
+                href = n.text.split(t)[-1]
+                n.text = ' '.join([t,style,href])
             self.url_modify(n)
         return root
 
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index fb5da04c04d..838e0d136d2 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -513,6 +513,6 @@ class report_sxw(report_rml, preprocess.report):
         create_doc = self.generators['html2html']
         html = etree.tostring(create_doc(html_dom, html_parser.localcontext))
 
-        return (html.replace('&lt;', '<').replace('&gt;', '>').replace('</br>',''), report_type)
+        return (html.replace('&amp;','&').replace('&lt;', '<').replace('&gt;', '>').replace('</br>',''), report_type)