diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9232a53addb..8158b43b533 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1164,6 +1164,13 @@
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="name" select="1"/>
+                        <field name="narration" select="1"/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
@@ -1173,12 +1180,6 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="ref" select="1" string="Reference"/>
-                        <field name="name" select="1"/>
-                        <field name="narration" select="1"/>
-                        <field name="balance" string="Debit/Credit" select='1'/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02536fc184c..14bf534eec4 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -205,6 +205,12 @@
                         <field name="user_id">
                             <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         </field>
+                    </group>
+					<newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="journal_id" widget="selection"/>
+                        <field name="product_id" widget="selection"/>
+                        <field name="amount" select="1"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -216,12 +222,6 @@
                         <separator orientation="vertical"/>
                         <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="journal_id" widget="selection"/>
-                        <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 954bfe3ff94..10c274ef529 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -87,6 +87,19 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
+                 <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -106,19 +119,6 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 6b308abcd78..a13c3675fa1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -75,7 +75,7 @@
                                 <field name="state"/>
                                 <button name="case_cancel" string="Cancel"
                                     states="draft" type="object"
-                                    icon="gtk-close" />
+                                    icon="gtk-cancel" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
                                     icon="gtk-cancel" />
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index db7bda3afe7..f0158631f51 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -14,7 +14,7 @@
                     <group col="2" colspan="2">
                     </group>
                     <group col="2" colspan="2">
-                        <button icon="gtk-close" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
                     </group>
                 </form>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 7ef262642e1..76d166fc070 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -12,7 +12,7 @@
                      <field name="open_action"/>
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
                     </group>
                 </form>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 6f84e5ec12c..6b3b130b0dc 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -141,7 +141,7 @@ class stock_partial_picking(osv.osv_memory):
                 <button icon='gtk-cancel' special="cancel"
                     string="_Cancel" />
                 <button name="do_partial" string="_Validate"
-                    colspan="1" type="object" icon="gtk-apply" />
+                    colspan="1" type="object" icon="gtk-go-forward" />
             </group>
         </form>"""
         result['arch'] = _moves_arch_lst