diff --git a/bom.py b/bom.py
index 0109c80a8c..d0f89b7be2 100644
--- a/bom.py
+++ b/bom.py
@@ -248,7 +248,7 @@ class OpenBOMTree(Wizard):
             ])
     tree = StateView('production.bom.tree.open.tree',
         'production.bom_tree_open_tree_view_form', [
-            Button('Change', 'start', 'tryton-go-previous'),
+            Button('Change', 'start', 'tryton-back'),
             Button('Close', 'end', 'tryton-close'),
             ])
 
diff --git a/icons/tryton-production.svg b/icons/tryton-production.svg
new file mode 100644
index 0000000000..1ee229783a
--- /dev/null
+++ b/icons/tryton-production.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path clip-rule="evenodd" fill="none" d="M0 0h24v24H0z"/>
+    <path d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/>
+</svg>
diff --git a/production.py b/production.py
index fc7fc50104..2592c2ae8d 100644
--- a/production.py
+++ b/production.py
@@ -185,8 +185,8 @@ class Production(Workflow, ModelSQL, ModelView):
                     'icon': If(Eval('state') == 'cancel',
                         'tryton-clear',
                         If(Eval('state') == 'request',
-                            'tryton-go-next',
-                            'tryton-go-previous')),
+                            'tryton-forward',
+                            'tryton-back')),
                     'depends': ['state'],
                     },
                 'reset_bom': {
@@ -198,10 +198,10 @@ class Production(Workflow, ModelSQL, ModelView):
                     'invisible': ~Eval('state').in_(['draft', 'assigned',
                             'waiting', 'running']),
                     'icon': If(Eval('state').in_(['assigned', 'running']),
-                        'tryton-go-previous',
+                        'tryton-back',
                         If(Eval('state') == 'waiting',
                             'tryton-clear',
-                            'tryton-go-next')),
+                            'tryton-forward')),
                     'depends': ['state'],
                     },
                 'run': {
@@ -651,7 +651,7 @@ class Assign(Wizard):
     start = StateTransition()
     failed = StateView('production.assign.failed',
         'production.assign_failed_view_form', [
-            Button('Force Assign', 'force', 'tryton-go-next',
+            Button('Force Assign', 'force', 'tryton-forward',
                 states={
                     'invisible': ~Id('stock',
                         'group_stock_force_assignment').in_(
diff --git a/production.xml b/production.xml
index 1aeee804bf..1c6cbc4aa8 100644
--- a/production.xml
+++ b/production.xml
@@ -31,16 +31,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="group_production"/>
         </record>
 
-        <menuitem name="Production" id="menu_production" sequence="10"/>
+        <record model="ir.ui.icon" id="production_icon">
+            <field name="name">tryton-production</field>
+            <field name="path">icons/tryton-production.svg</field>
+        </record>
+
+        <menuitem name="Production" id="menu_production" sequence="10" icon="tryton-production"/>
         <record model="ir.ui.menu-res.group"
             id="menu_production_group_production">
             <field name="menu" ref="menu_production"/>
             <field name="group" ref="group_production"/>
         </record>
 
-        <menuitem name="Configuration" parent="menu_production"
-            id="menu_configuration"
-            sequence="0" icon="tryton-preferences"/>
+        <menuitem name="Configuration" parent="menu_production" id="menu_configuration" sequence="0" icon="tryton-settings"/>
         <record model="ir.ui.menu-res.group"
             id="menu_configuration_group_production_admin">
             <field name="menu" ref="menu_configuration"/>
diff --git a/setup.py b/setup.py
index 8ade512383..239437f87c 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,8 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.production': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst',
+                'icons/*.svg']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/production_form.xml b/view/production_form.xml
index a841e797ff..f32869da2a 100644
--- a/view/production_form.xml
+++ b/view/production_form.xml
@@ -47,9 +47,9 @@ this repository contains the full copyright notices and license terms. -->
             <button name="draft"/>
             <button name="reset_bom" icon="tryton-clear"/>
             <button name="wait"/>
-            <button name="assign_wizard" icon="tryton-go-next"/>
-            <button name="run" icon="tryton-go-next"/>
-            <button name="done" icon="tryton-go-next"/>
+            <button name="assign_wizard" icon="tryton-forward"/>
+            <button name="run" icon="tryton-forward"/>
+            <button name="done" icon="tryton-forward"/>
         </group>
     </group>
 </form>