diff --git a/inventory.xml b/inventory.xml
index 041cb4fc23..5c11017de0 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -88,26 +88,6 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem parent="menu_stock" sequence="50"
             action="act_inventory_form" id="menu_inventory_form"/>
 
-        <record model="ir.action.act_window" id="act_inventory_form2">
-            <field name="name">Inventories</field>
-            <field name="res_model">stock.inventory</field>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_inventory_form2_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="inventory_view_form"/>
-            <field name="act_window" ref="act_inventory_form2"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_inventory_form2_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="inventory_view_tree"/>
-            <field name="act_window" ref="act_inventory_form2"/>
-        </record>
-        <menuitem name="New Inventory" parent="menu_inventory_form"
-            action="act_inventory_form2" id="menu_inventory_form_new"
-            sequence="10"/>
-
         <record model="ir.action.act_window" id="act_inventory_form_draft">
             <field name="name">Draft Inventories</field>
             <field name="res_model">stock.inventory</field>
diff --git a/shipment.xml b/shipment.xml
index 8ef8e7a569..6b9f97f8ad 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -105,24 +105,24 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem parent="menu_stock" sequence="20"
             action="act_shipment_in_form" id="menu_shipment_in_form"/>
 
-        <record model="ir.action.act_window" id="act_shipment_in_form2">
-            <field name="name">New Supplier Shipment</field>
+        <record model="ir.action.act_window" id="act_shipment_in_draft">
+            <field name="name">Draft Supplier Shipment</field>
             <field name="res_model">stock.shipment.in</field>
         </record>
         <record model="ir.action.act_window.view"
-                id="act_shipment_in_form2_view1">
-            <field name="sequence" eval="1"/>
-            <field name="view" ref="shipment_in_view_form"/>
-            <field name="act_window" ref="act_shipment_in_form2"/>
+                id="act_shipment_in_draft_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="shipment_in_view_tree"/>
+            <field name="act_window" ref="act_shipment_in_draft"/>
         </record>
         <record model="ir.action.act_window.view"
-                id="act_shipment_in_form2_view2">
-            <field name="sequence" eval="2"/>
-            <field name="view" ref="shipment_in_view_tree"/>
-            <field name="act_window" ref="act_shipment_in_form2"/>
+                id="act_shipment_in_draft_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="shipment_in_view_form"/>
+            <field name="act_window" ref="act_shipment_in_draft"/>
         </record>
         <menuitem parent="menu_shipment_in_form" sequence="10"
-            action="act_shipment_in_form2" id="menu_shipment_in_form2"/>
+            action="act_shipment_in_draft" id="menu_shipment_in_draft"/>
 
         <record model="ir.action.act_window" id="act_shipment_in_form_received">
             <field name="name">Received Supplier shipments</field>
@@ -237,26 +237,6 @@ this repository contains the full copyright notices and license terms. -->
                   action="act_shipment_in_return_form"
                   id="menu_shipment_in_return_form"/>
 
-        <record model="ir.action.act_window" id="act_shipment_in_return_new_form">
-            <field name="name">New Supplier Return Shipment</field>
-            <field name="res_model">stock.shipment.in.return</field>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_in_return_new_form_view1">
-            <field name="sequence" eval="2"/>
-            <field name="view" ref="shipment_in_return_view_tree"/>
-            <field name="act_window" ref="act_shipment_in_return_new_form"/>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_in_return_new_form_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view" ref="shipment_in_return_view_form"/>
-            <field name="act_window" ref="act_shipment_in_return_new_form"/>
-        </record>
-        <menuitem parent="menu_shipment_in_return_form" sequence="10"
-                  action="act_shipment_in_return_new_form"
-                  id="menu_shipment_in_return_new_form"/>
-
         <record model="ir.ui.view" id="shipment_in_return_assign_assign_failed_view_form">
             <field name="model">stock.shipment.in.return.assign.assign_failed</field>
             <field name="type">form</field>
@@ -575,26 +555,6 @@ this repository contains the full copyright notices and license terms. -->
                   action="act_shipment_internal_form"
                   id="menu_shipment_internal_form"/>
 
-        <record model="ir.action.act_window" id="act_shipment_internal_new_form">
-            <field name="name">New Internal Shipment</field>
-            <field name="res_model">stock.shipment.internal</field>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_internal_new_form_view1">
-            <field name="sequence" eval="2"/>
-            <field name="view" ref="shipment_internal_view_tree"/>
-            <field name="act_window" ref="act_shipment_internal_new_form"/>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_internal_new_form_view2">
-            <field name="sequence" eval="1"/>
-            <field name="view" ref="shipment_internal_view_form"/>
-            <field name="act_window" ref="act_shipment_internal_new_form"/>
-        </record>
-        <menuitem parent="menu_shipment_internal_form" sequence="10"
-                  action="act_shipment_internal_new_form"
-                  id="menu_shipment_internal_new_form"/>
-
         <record model="ir.action.act_window" id="act_shipment_internal_draft_form">
             <field name="name">Draft Internal Shipments</field>
             <field name="res_model">stock.shipment.internal</field>
@@ -784,25 +744,6 @@ this repository contains the full copyright notices and license terms. -->
                   action="act_shipment_out_return_form"
                   id="menu_shipment_out_return_form"/>
 
-        <record model="ir.action.act_window" id="act_shipment_out_return_form2">
-            <field name="name">New Customer Return Shipment</field>
-            <field name="res_model">stock.shipment.out.return</field>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_out_return_form2_view1">
-            <field name="sequence" eval="1"/>
-            <field name="view" ref="shipment_out_return_view_form"/>
-            <field name="act_window" ref="act_shipment_out_return_form2"/>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_shipment_out_return_form2_view2">
-            <field name="sequence" eval="2"/>
-            <field name="view" ref="shipment_out_return_view_tree"/>
-            <field name="act_window" ref="act_shipment_out_return_form2"/>
-        </record>
-        <menuitem parent="menu_shipment_out_return_form" sequence="10"
-            action="act_shipment_out_return_form2" id="menu_shipment_out_return_form2"/>
-
         <!-- Workflow shipment in -->
         <record model="workflow" id="wkf_shipmentin">
             <field name="name">Supplier Shipment</field>
diff --git a/stock.xml b/stock.xml
index 8048fc2936..28aea89f01 100644
--- a/stock.xml
+++ b/stock.xml
@@ -48,7 +48,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">tryton-inventory</field>
             <field name="path">icons/tryton-inventory.svg</field>
         </record>
-        <menuitem name="Inventory Management" sequence="3" id="menu_stock"
+        <menuitem name="Inventory &amp; Inventory" sequence="3" id="menu_stock"
             icon="tryton-inventory"/>
         <menuitem name="Configuration" parent="menu_stock"
             id="menu_configuration" sequence="0" icon="tryton-preferences"/>