diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 7e4f9db9eb4..ddeb68c6595 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -10,15 +10,9 @@
           <form position="attributes">
             <attribute name="string">Install Applications</attribute>
           </form>
-<<<<<<< TREE
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</xpath>
-=======
           <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
->>>>>>> MERGE-SOURCE
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                     <attribute name='rowspan'>15</attribute>
@@ -29,17 +23,8 @@
           <separator string="title" position="attributes">
             <attribute name="string">Install Applications</attribute>
           </separator>
-            
+
           <group colspan="8">
-<<<<<<< TREE
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-=======
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
@@ -47,17 +32,10 @@
             <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
->>>>>>> MERGE-SOURCE
             <separator string="Install Specific Industry Sector Applications" colspan="4"/>
-<<<<<<< TREE
-            <field name="association" attrs="{'readonly':['|', ('auction','=',True), ('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="auction" attrs="{'readonly':['|', ('association','=',True), ('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="product_expiry" attrs="{'readonly':['|', ('association','=',True), ('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-=======
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
->>>>>>> MERGE-SOURCE
           </group>
         </data>
       </field>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index bd10cbcc1d7..0319c69823e 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -3,7 +3,7 @@
     <record model="ir.actions.url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
-    </record> 
+    </record>
 
 
 
@@ -30,13 +30,7 @@
             <group string="res_config_contents" position="replace">
                 <field name="host"/>
             </group>
-<<<<<<< TREE
-           <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-=======
            <xpath expr="//button[@name='action_skip']" position="replace"/>
->>>>>>> MERGE-SOURCE
           </data>
         </field>
     </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9db500d93ff..7e17494a5d4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -109,10 +109,10 @@
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
-                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
+                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
+                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
diff --git a/addons/project/wizard/project_task_close_view.xml b/addons/project/wizard/project_task_close_view.xml
index 9692fe9a733..4e55d7af1c9 100644
--- a/addons/project/wizard/project_task_close_view.xml
+++ b/addons/project/wizard/project_task_close_view.xml
@@ -8,20 +8,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Done Task" >
-					  <separator string="Done Task and Inform to Project Manager or Customer by Email " colspan="4"/>              		  
+					  <separator string="Done Task and Inform to Project Manager or Customer by Email " colspan="4"/>
               		  <group colspan="4" col="4">
                             <field name="manager_warn" invisible="1"/>
 		                    <field name="manager_email" widget="email" attrs="{'invisible':[('manager_warn','=',False)], 'required':[('manager_warn','=',True)]}"/>
                             <field name="partner_warn" invisible="1"/>
 		                    <field name="partner_email" widget="email" attrs="{'invisible':[('partner_warn','=',False)], 'required':[('partner_warn','=',True)]}"/>
-					        <separator string="Warn Message" colspan="4"/>   
+					        <separator string="Warn Message" colspan="4"/>
 		                    <field name="description" nolabel="1" colspan="4"/>
 		              </group>
 		              <separator string="" colspan="4"/>
                       <group colspan="2" col="2">
-                      </group>  
+                      </group>
 		              <group colspan="2" col="3">
-		            		<button icon="gtk-close" special="cancel" string="_Close"/>
+		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
                             <button  icon="gtk-jump-to" string="_Done" special="cancel" name="done" type="object"/>
 		            		<button  icon="terp-mail-message-new" string="_Send+Done" name="confirm" type="object"/>
 		              </group>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7bedecd8f53..a9e4e97b93a 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -15,7 +15,7 @@
 		                    <field name="name" colspan="4"/>
 		                    <field name="new_task_description" colspan="4" />
                       </group>
-                      <group colspan="2" col="2">    
+                      <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
 		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
            	                <field name="prefix" colspan="4"/>
@@ -23,9 +23,9 @@
 		              </group>
                       <separator string="" colspan="4"/>
                       <group colspan="2" col="2">
-                      </group>  
+                      </group>
 		              <group colspan="2" col="2">
-		            		<button icon="gtk-close" special="cancel" string="_Close"/>
+		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 5e0e7c89069..db7bda3afe7 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <record id="view_project_task_reevaluate" model="ir.ui.view">
             <field name="name">Re-evaluate Task</field>
             <field name="model">project.task.reevaluate</field>
@@ -14,7 +14,7 @@
                     <group col="2" colspan="2">
                     </group>
                     <group col="2" colspan="2">
-                        <button icon="gtk-close" special="cancel" string="_Close"/>
+                        <button icon="gtk-close" special="cancel" string="_Cancel"/>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
                     </group>
                 </form>
diff --git a/addons/project/wizard/project_task_review.xml b/addons/project/wizard/project_task_review.xml
index f1351caec69..5340ef01fbc 100644
--- a/addons/project/wizard/project_task_review.xml
+++ b/addons/project/wizard/project_task_review.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Project Task Review">
-              	<separator string="Review Task " colspan="4"/>            
+              	<separator string="Review Task " colspan="4"/>
                       <group colspan="4">
 		                    <field name="user_id" colspan="4"/>
-			  				<separator string="Remark" colspan="4"/>   
-					  		<newline/>		                    
+			  				<separator string="Remark" colspan="4"/>
+					  		<newline/>
 		                   <field name="description" nolabel="1" colspan="4"/>
                       </group>
 		              <group colspan="4" >
-		            		<button icon="gtk-close" special="cancel" string="Close"/>
+		            		<button icon="gtk-close" special="cancel" string="Cancel"/>
 		            		<button icon="gtk-ok" name="review" string="Review" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ee763b759b6..c85fe37026d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -60,8 +60,9 @@
                         <field name="phase_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -184,7 +185,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree string="Project Phases">
+                <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases">
                     <field name="name"/>
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
@@ -228,23 +229,26 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-document-new" default="1"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -257,7 +261,7 @@
             <field name="view_mode">tree,form,gantt,calendar</field>
             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>            
+            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
@@ -320,7 +324,7 @@
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"  
+            groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8818684e8fa..e76c86ab60f 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -16,7 +16,7 @@
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2"> <!-- Improve me -->
-	                        <button  icon="gtk-close" special="cancel" string="_Close"/>
+	                        <button  icon="gtk-close" special="cancel" string="_Cancel"/>
 	                        <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
                         </group>
 		            </group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index e0cd30d5622..5a28c4ce00e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,13 +9,13 @@
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Task">
 	                <group colspan="4">
- 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />	                
+ 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />
                         <field name="project_id" widget="selection" colspan="4"/>
                         <separator colspan="4"/>
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2">
-                            <button  icon="gtk-close" special="cancel" string="_Close"/>
+                            <button  icon="gtk-close" special="cancel" string="_Cancel"/>
 		            	    <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
 		              </group>
 		            </group>
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 7c292f10a7e..bd476e3bc39 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -29,7 +29,7 @@
                	</xpath>
             </field>
        	</record>
-       	
+
        	 <record id="view_project_message_form" model="ir.ui.view">
             <field name="name">project.messages.form</field>
             <field name="model">project.messages</field>
@@ -48,7 +48,7 @@
                 </form>
             </field>
        </record>
-       
+
 		<record id="view_project_message_tree" model="ir.ui.view">
             <field name="name">project.messages.tree</field>
             <field name="model">project.messages</field>
@@ -61,7 +61,7 @@
                 </tree>
             </field>
        	</record>
-       	
+
        	<record id="view_project_messages_search" model="ir.ui.view">
            <field name="name">project.messages.search</field>
            <field name="model">project.messages</field>
@@ -76,13 +76,14 @@
                		<newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                     	<filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
                     </group>
                </search>
            </field>
         </record>
-        
+
        	<record id="messages_form" model="ir.actions.act_window">
             <field name="name">Communication Messages</field>
             <field name="res_model">project.messages</field>
@@ -90,11 +91,11 @@
             <field name="search_view_id" ref="view_project_messages_search"/>
             <field name="context">{"search_default_to_id":uid}</field>
             <field name="view_id" ref="view_project_message_tree"/>
-			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>            
+			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
         </record>
-        
+
         <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
-         
+
          <!--Actions for deshboard -->
 
         <record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index fe995d30103..f6bcc80060f 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -143,17 +143,17 @@
                         <field name="name"/>
                         <field name="project_id"/>
                         <field name="sprint_id" domain="[('state','in',('draft','open'))]">
-                            <filter icon="terp-project"
+                            <filter icon="terp-check"
                                 string="Sprints"
                                 domain="[('sprint_id.state','=','open')]"
                                 help="Backlogs Assigned To Current Sprints"/>
-                            <filter icon="terp-project"
+                            <filter icon="terp-personal-"
                                 string="Sprints"
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
                         <field name="user_id">
-                            <filter icon="terp-project"
+                            <filter icon="terp-personal"
                                 string="My Backlogs"
                                 name="my_user_id"
                                 domain="[('user_id','=',uid)]"
@@ -161,16 +161,18 @@
                         </field>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Options..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
-                    </group>
                 </search>
             </field>
         </record>
@@ -284,11 +286,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Start Date" icon="terp_go_month" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -375,6 +379,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 6707a7326d0..ce373beb44f 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -14,8 +14,8 @@
                 <group col="2" colspan="2">
                 </group>
 			    <group col="2" colspan="2">
-            		<button special="cancel"  string="_Close" icon='gtk-close'/>
-					<button name="do_create" string="Co_nvert" colspan="1" type="object" icon="gtk-execute"/>
+            		<button special="cancel"  string="_Cancel" icon='gtk-close'/>
+					<button name="do_create" string="C_onvert" colspan="1" type="object" icon="gtk-execute"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
index a75dcd71d06..c9cdd7423ed 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
@@ -10,7 +10,7 @@
                    <separator string="Are you sure you want to merge these Backlogs?" colspan="4"/>
                    <label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs" />
                    <separator colspan="4"/>
-                   <button colspan="2" special="cancel" string="Close" icon="gtk-close"/>
+                   <button colspan="2" special="cancel" string="Cancel" icon="gtk-close"/>
                    <button colspan="2" default_focus="1" name="check_backlogs" string="Merge" type="object" icon="gtk-execute"/>
                </form>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
index b6c5ea30b42..2d2010d385d 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
@@ -16,7 +16,7 @@
                     <group col="2" colspan="2">
                     </group>
 					<group col="2" colspan="2">
-						<button special="cancel"  string="_Close" icon='gtk-close'/>
+						<button special="cancel"  string="_Cancel" icon='gtk-close'/>
 						<button name="assign_sprint" string="_Assign" colspan="1" type="object" icon="gtk-execute"/>
 					</group>
 				</form>