diff --git a/asset.xml b/asset.xml
index ee41f56bfa..71f4606449 100644
--- a/asset.xml
+++ b/asset.xml
@@ -121,63 +121,37 @@
             <field name="view" ref="asset_view_form"/>
             <field name="act_window" ref="act_asset_form"/>
         </record>
+        <record model="ir.action.act_window.domain"
+            id="act_asset_form_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain">[('state', '=', 'draft')]</field>
+            <field name="act_window" ref="act_asset_form"/>
+        </record>
+        <record model="ir.action.act_window.domain"
+            id="act_asset_form_domain_running">
+            <field name="name">Running</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain">[('state', '=', 'running')]</field>
+            <field name="act_window" ref="act_asset_form"/>
+        </record>
+        <record model="ir.action.act_window.domain"
+            id="act_asset_form_domain_closed">
+            <field name="name">Closed</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain">[('state', '=', 'closed')]</field>
+            <field name="act_window" ref="act_asset_form"/>
+        </record>
+        <record model="ir.action.act_window.domain"
+            id="act_asset_form_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_asset_form"/>
+        </record>
         <menuitem parent="menu_asset" sequence="10"
             action="act_asset_form" id="menu_asset_form"/>
 
-        <record model="ir.action.act_window" id="act_draft_asset_form">
-            <field name="name">Draft Assets</field>
-            <field name="res_model">account.asset</field>
-            <field name="domain">[('state', '=', 'draft')]</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_draft_asset_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="asset_view_tree"/>
-            <field name="act_window" ref="act_draft_asset_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_draft_asset_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="asset_view_form"/>
-            <field name="act_window" ref="act_draft_asset_form"/>
-        </record>
-        <menuitem parent="menu_asset_form" sequence="10"
-            action="act_draft_asset_form" id="menu_draft_asset_form"/>
-
-        <record model="ir.action.act_window" id="act_running_asset_form">
-            <field name="name">Running Assets</field>
-            <field name="res_model">account.asset</field>
-            <field name="domain">[('state', '=', 'running')]</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_running_asset_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="asset_view_tree"/>
-            <field name="act_window" ref="act_running_asset_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_running_asset_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="asset_view_form"/>
-            <field name="act_window" ref="act_running_asset_form"/>
-        </record>
-        <menuitem parent="menu_asset_form" sequence="20"
-            action="act_running_asset_form" id="menu_running_asset_form"/>
-
-        <record model="ir.action.act_window" id="act_closed_asset_form">
-            <field name="name">Closed Assets</field>
-            <field name="res_model">account.asset</field>
-            <field name="domain">[('state', '=', 'closed')]</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_closed_asset_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="asset_view_tree"/>
-            <field name="act_window" ref="act_closed_asset_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_closed_asset_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="asset_view_form"/>
-            <field name="act_window" ref="act_closed_asset_form"/>
-        </record>
-        <menuitem parent="menu_asset_form" sequence="20"
-            action="act_closed_asset_form" id="menu_closed_asset_form"/>
-
         <record model="ir.sequence.type" id="sequence_type_asset">
             <field name="name">Asset</field>
             <field name="code">account.asset</field>
@@ -347,7 +321,7 @@
             <field name="name">Create Assets Moves</field>
             <field name="wiz_name">account.asset.create_moves</field>
         </record>
-        <menuitem name="Create Assets Moves" parent="menu_asset" sequence="20"
+        <menuitem name="Create Assets Moves" parent="menu_asset" sequence="10"
             action="wizard_create_moves" id="menu_create_moves"/>
     </data>
     <data noupdate="1">