diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 647f32767d1..d57e33b44c6 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <terp>
 	<data>
-		<menuitem name="Dashboards" icon="terp-account" id="dashboard_menu"/>
+		<menuitem name="Dashboards" icon="terp-graph" id="dashboard_menu"/>
 
 		<record model="ir.ui.view" id="view_board_note_tree">
 			<field name="name">board.note.tree</field>
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 45c67806df7..bda4e4b4c52 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -144,6 +144,7 @@
 			name="Dashboards/Accounting/"
 			action="open_board_account"
 			sequence="1"
-			id="menu_board_account"/>
+			id="menu_board_account"
+			icon="terp-graph"/>
 	</data>
 </terp>
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index bc005bdd902..38442fb1a32 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -56,7 +56,8 @@
 			name="Dashboards/Production/Production Dashboard"
 			action="open_board_manufacturing"
 			sequence="1"
-			id="menu_board_manufacturing"/>
+			id="menu_board_manufacturing"
+			icon="terp-graph"/>
 
 	</data>
 </terp>
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index e6f19496ec0..02dddc20272 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -6,9 +6,9 @@
 			<field name="name">Project managers</field>
 		</record>
 
-		#
-		# Board for project managers
-		#
+		<!--
+		 Board for project managers
+		 -->
 		<act_window name="My projects"
 			domain="[('manager', '=', uid)]"
 			res_model="project.project"
@@ -122,7 +122,8 @@
 			name="Dashboards/Project/Project Manager"
 			action="open_board_project_manager"
 			sequence="1"
-			id="menu_board_project_manager"/>
+			id="menu_board_project_manager"
+			icon="terp-graph"/>
 
 
 
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 284bab62304..453859c0f2d 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -108,7 +108,7 @@
 			name="Dashboards/Project/Project Member"
 			action="open_board_project"
 			sequence="1"
-			id="menu_board_project"/>
+			id="menu_board_project" icon="terp-graph"/>
 
 </data>
 </terp>
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index ad77f56c69f..356b062dd8c 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -55,7 +55,8 @@
 			name="Dashboards/Sales/Sales Manager"
 			action="open_board_sales_manager"
 			sequence="1"
-			id="menu_board_sales_manager"/>
+			id="menu_board_sales_manager"
+			icon="terp-graph"/>
 
 	</data>
 </terp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 1d461c65d2c..9707535831e 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <terp>
 <data noupdate="1">
-	#
-	# Case Sections
-	#
+
+	<!--
+	Case Sections
+	-->
 
 	<record model="crm.case.section" id="section_support">
 		<field name="name">Helpdesk and Support</field>
@@ -18,9 +19,9 @@
 		<field name="code">purchase</field>
 	</record>
 
-	#
-	# Case Categories
-	#
+	<!--
+	Case Categories
+	-->
 
 	<record model="crm.case.categ" id="categ1">
 		<field name="name">Computer Crashed</field>
@@ -47,9 +48,7 @@
 		<field name="section_id" ref="section_purchase"/>
 	</record>
 
-	# --------------------------------------------------------------
-	# Specific menus
-	# --------------------------------------------------------------
+	<!-- Specific menus -->
 
 	<!--
 	<record model="ir.actions.act_window" id="crm_case_categ2-act">
@@ -59,7 +58,7 @@
 		<field name="view_id" ref="crm_case-view"/>
 		<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Helpdesk/Helpdesk Cases" id="menu_crm_case_categ2-act" action="crm_case_categ2-act"/>
+	<menuitem name="Crm &amp; Srm/Helpdesk/Helpdesk Cases" id="menu_crm_case_categ2-act" action="crm_case_categ2-act"/>
 	-->
 
 	<function
@@ -67,9 +66,7 @@
 		name="menu_create"
 		eval="([section_support], 'Helpdesk', ref('menu_crm'))"/>
 
-	# --------------------------------------------------------------
-	# Demo Cases
-	# --------------------------------------------------------------
+	<!-- Demo Cases -->
 
 	<record model="crm.case">
 		<field name="name">Think about Tiny ERP</field>
diff --git a/addons/l10n_ch/vaudtax_data_demo.xml b/addons/l10n_ch/vaudtax_data_demo.xml
index 30822450645..b0b55f2a8c6 100644
--- a/addons/l10n_ch/vaudtax_data_demo.xml
+++ b/addons/l10n_ch/vaudtax_data_demo.xml
@@ -61,7 +61,7 @@
     	<menuitem name="Administration" icon="terp-administration" groups="admin,grcomptaadmin" sequence="20" />
 
 	<!--
-	<menuitem name="Crm &Amp; Srm" icon="terp-crm" groups="admin,gruser" sequence="3" />
+	<menuitem name="Crm &amp; Srm" icon="terp-crm" groups="admin,gruser" sequence="3" />
 	<menuitem name="Partners" icon="terp-partner" groups="admin,grcomptaadmin,user,grcompta" sequence="1" />
 	<menuitem name="Human Resources" icon="terp-hr" groups="admin,gruser" sequence="5" />
 	<menuitem name="Financial Management" icon="terp-account" groups="admin,grcomptaadmin,gruser,grcompta" sequence="2" />
@@ -76,7 +76,7 @@
 	<menuitem name="Financial Management/Configuration" groups="admin,grcomptaadmin" sequence="1" />
 	<menuitem name="Sales Management/Configuration" groups="admin" sequence="1" />
 	<menuitem name="Inventory Control/Configuration" groups="admin" sequence="1" />
-	<menuitem name="Crm &Amp; Srm/Configuration" groups="admin" sequence="1" />
+	<menuitem name="Crm &amp; Srm/Configuration" groups="admin" sequence="1" />
 	<menuitem name="Products/Configuration" groups="admin" sequence="1" />
 	<menuitem name="Production/Configuration" groups="admin" sequence="1" />
 	<menuitem name="Project/Configuration" groups="admin" sequence="1" />
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 07e398fcc1f..01edf9653a4 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -2,9 +2,9 @@
 <terp>
 <data>
 
-	#
-	# Cases by user and section
-	#
+	<!--
+	Cases by user and section
+	-->
 
 	<record model="ir.ui.view" id="view_crm_case_user_tree">
 		<field name="name">report.crm.case.user.tree</field>
@@ -61,13 +61,15 @@
 		<field name="view_mode">tree,graph</field>
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/This Month/Cases by User and Section" action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month"/>
+
+	<menuitem name="Crm &amp; Srm/Reporting/This Month/Cases by User and Section" action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month"/>
+
 	<record model="ir.actions.act_window" id="action_report_crm_case_user_tree">
 		<field name="res_model">report.crm.case.user</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/All Months/Cases by User and Section" action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree"/>
+	<menuitem name="Crm &amp; Srm/Reporting/All Months/Cases by User and Section" action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree"/>
 
 	<record model="ir.actions.act_window" id="action_report_crm_case_user_tree_month_my">
 		<field name="name">My cases by section (this month)</field>
@@ -76,7 +78,7 @@
 		<field name="view_mode">tree</field>
 		<field name="domain">[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/This Month/My Cases by Section" action="action_report_crm_case_user_tree_month_my" id="menu_crm_case_user_tree_month_my"/>
+	<menuitem name="Crm &amp; Srm/Reporting/This Month/My Cases by Section" action="action_report_crm_case_user_tree_month_my" id="menu_crm_case_user_tree_month_my"/>
 
 	<record model="ir.actions.act_window" id="action_report_crm_case_user_tree_my">
 		<field name="name">My cases by section</field>
@@ -85,7 +87,7 @@
 		<field name="view_mode">tree</field>
 		<field name="domain">[('user_id','=',uid)]</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/All Months/My Cases by Section" action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my"/>
+	<menuitem name="Crm &amp; Srm/Reporting/All Months/My Cases by Section" action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my"/>
 
 	#
 	# Cases by section and categoryof case
@@ -133,13 +135,13 @@
 		<field name="view_mode">tree</field>
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/This Month/Cases by Categories and Section" action="action_report_crm_case_categ_tree_month" id="menu_crm_case_categ_tree_month"/>
+	<menuitem name="Crm &amp; Srm/Reporting/This Month/Cases by Categories and Section" action="action_report_crm_case_categ_tree_month" id="menu_crm_case_categ_tree_month"/>
 	<record model="ir.actions.act_window" id="action_report_crm_case_categ_tree">
 		<field name="res_model">report.crm.case.categ</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree</field>
 	</record>
-	<menuitem name="Crm &Amp; Srm/Reporting/All Months/Cases by Categories and Section" action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree"/>
+	<menuitem name="Crm &amp; Srm/Reporting/All Months/Cases by Categories and Section" action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree"/>
 
 	<act_window name="Monthly cases"
 		domain="[('user_id', '=', active_id)]"