diff --git a/barcodes_generate/README.rst b/barcodes_generate/README.rst
index 2b2ceeaa..2da7ca4c 100644
--- a/barcodes_generate/README.rst
+++ b/barcodes_generate/README.rst
@@ -45,7 +45,7 @@ To use this module, you need to:
 * Go to a Product form (or a Partner Form):
 * set a rule to the current object
 
-.. image:: /barcodes_generate/static/description/product_product_form_empty.png
+.. image:: /barcodes_generate/static/description/product_product_form_generate_base_barcode.png
 
 * Click on 'Generate Base and Barcode'
 
@@ -54,6 +54,8 @@ To use this module, you need to:
 
 Alternatively you can set manually a barcode base, and click only on Generate barcode.
 
+.. image:: /barcodes_generate/static/description/product_product_form_generate_barcode.png
+
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
    :target: https://runbot.odoo-community.org/runbot/184/9.0
diff --git a/barcodes_generate/static/description/product_product_form_empty.png b/barcodes_generate/static/description/product_product_form_empty.png
deleted file mode 100644
index 8ed388be..00000000
Binary files a/barcodes_generate/static/description/product_product_form_empty.png and /dev/null differ
diff --git a/barcodes_generate/static/description/product_product_form_generate_barcode.png b/barcodes_generate/static/description/product_product_form_generate_barcode.png
new file mode 100644
index 00000000..abcf9182
Binary files /dev/null and b/barcodes_generate/static/description/product_product_form_generate_barcode.png differ
diff --git a/barcodes_generate/static/description/product_product_form_generate_base_barcode.png b/barcodes_generate/static/description/product_product_form_generate_base_barcode.png
new file mode 100644
index 00000000..f980bbb3
Binary files /dev/null and b/barcodes_generate/static/description/product_product_form_generate_base_barcode.png differ
diff --git a/barcodes_generate/views/view_product_product.xml b/barcodes_generate/views/view_product_product.xml
index b45483e1..ff706451 100644
--- a/barcodes_generate/views/view_product_product.xml
+++ b/barcodes_generate/views/view_product_product.xml
@@ -28,8 +28,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                             ('barcode_base', '!=', False)]}"
                     groups="barcodes_generate.generate_product_barcode" colspan="1"/>
                 <button name="generate_barcode" type="object" string="Generate Barcode"
-                    attrs="{'invisible': ['|',
+                    attrs="{'invisible': ['|', '|',
                             ('barcode_rule_id', '=', False),
+                            ('barcode_base', '=', False),
                             ('barcode', '!=', False)]}"
                     groups="barcodes_generate.generate_partner_barcode" colspan="1"/>
             </field>
diff --git a/barcodes_generate/views/view_res_partner.xml b/barcodes_generate/views/view_res_partner.xml
index 76c183d6..609b4845 100644
--- a/barcodes_generate/views/view_res_partner.xml
+++ b/barcodes_generate/views/view_res_partner.xml
@@ -28,8 +28,9 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                             ('barcode_base', '!=', False)]}"
                     groups="barcodes_generate.generate_partner_barcode" colspan="1"/>
                 <button name="generate_barcode" type="object" string="Generate Barcode"
-                    attrs="{'invisible': ['|',
+                    attrs="{'invisible': ['|', '|',
                             ('barcode_rule_id', '=', False),
+                            ('barcode_base', '=', False),
                             ('barcode', '!=', False)]}"
                     groups="barcodes_generate.generate_partner_barcode" colspan="1"/>
             </field>