diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml
index 2eb262169e7..7ae08999c87 100644
--- a/addons/product/data/product_demo.xml
+++ b/addons/product/data/product_demo.xml
@@ -83,7 +83,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">FURN_7777</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_chair.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_chair.jpg"/>
         </record>
 
         <record id="product_delivery_02" model="product.product">
@@ -245,25 +245,25 @@
             <field name="default_code">FURN_0096</field>
             <field name="standard_price">500.0</field>
             <field name="weight">0.01</field>
-            <field name="image_1920" type="base64" file="product/static/img/table02.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/table02.jpg"/>
         </record>
         <record id="product_product_4b" model="product.product">
             <field name="default_code">FURN_0097</field>
             <field name="weight">0.01</field>
             <field name="standard_price">500.0</field>
-            <field name="image_1920" type="base64" file="product/static/img/table04.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/table04.jpg"/>
         </record>
         <record id="product_product_4c" model="product.product">
             <field name="default_code">FURN_0098</field>
             <field name="weight">0.01</field>
             <field name="standard_price">500.0</field>
-            <field name="image_1920" type="base64" file="product/static/img/table03.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/table03.jpg"/>
         </record>
         <record id="product_product_4d" model="product.product">
             <field name="default_code">DESK0004</field>
             <field name="weight">0.01</field>
             <field name="standard_price">500.0</field>
-            <field name="image_1920" type="base64" file="product/static/img/table01.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/table01.jpg"/>
         </record>
 
         <record id="product_product_5" model="product.product">
@@ -276,7 +276,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM06</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_5-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_5-image.jpg"/>
         </record>
 
         <record id="product_product_6" model="product.product">
@@ -290,7 +290,7 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM07</field>
             <field name='weight'>0.330</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_6-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_6-image.jpg"/>
         </record>
 
         <record id="product_product_7" model="product.product">
@@ -330,7 +330,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM10</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_9-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_9-image.jpg"/>
         </record>
 
         <record id="product_product_10" model="product.product">
@@ -343,7 +343,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM11</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_10-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_10-image.jpg"/>
         </record>
 
         <record id="product_product_11_product_template" model="product.template">
@@ -430,7 +430,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">FURN_1118</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_13-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_13-image.jpg"/>
         </record>
 
         <record id="product_product_16" model="product.product">
@@ -443,7 +443,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">FURN_8900</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_16-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_16-image.jpg"/>
         </record>
 
         <record id="product_product_20" model="product.product">
@@ -481,7 +481,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">FURN_0789</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_24-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_24-image.jpg"/>
         </record>
 
         <record id="product_product_25" model="product.product">
@@ -508,7 +508,7 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description">Drawer with two routing possiblities.</field>
             <field name="default_code">FURN_8855</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_27-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_27-image.jpg"/>
         </record>
 
         <record id="consu_delivery_03" model="product.product">
@@ -536,7 +536,7 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">Conference room table</field>
             <field name="default_code">FURN_6741</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_46-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_46-image.jpg"/>
         </record>
 
         <record id="consu_delivery_01" model="product.product">
@@ -550,7 +550,7 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">Three Seater Sofa with Lounger in Steel Grey Colour</field>
             <field name="default_code">FURN_8999</field>
-            <field name="image_1920" type="base64" file="product/static/img/product_product_d01-image.png"/>
+            <field name="image_1920" type="base64" file="product/static/img/product_product_d01-image.jpg"/>
         </record>
 
         <!--
diff --git a/addons/product/static/img/product_chair.jpg b/addons/product/static/img/product_chair.jpg
new file mode 100644
index 00000000000..e9ffb61ca18
Binary files /dev/null and b/addons/product/static/img/product_chair.jpg differ
diff --git a/addons/product/static/img/product_chair.png b/addons/product/static/img/product_chair.png
deleted file mode 100644
index 5add5e91ba8..00000000000
Binary files a/addons/product/static/img/product_chair.png and /dev/null differ
diff --git a/addons/product/static/img/product_lamp.png b/addons/product/static/img/product_lamp.png
index 03e6bb60b11..381faff899f 100644
Binary files a/addons/product/static/img/product_lamp.png and b/addons/product/static/img/product_lamp.png differ
diff --git a/addons/product/static/img/product_product_10-image.jpg b/addons/product/static/img/product_product_10-image.jpg
new file mode 100644
index 00000000000..5c7eb5fce0f
Binary files /dev/null and b/addons/product/static/img/product_product_10-image.jpg differ
diff --git a/addons/product/static/img/product_product_10-image.png b/addons/product/static/img/product_product_10-image.png
deleted file mode 100644
index a839c7fe101..00000000000
Binary files a/addons/product/static/img/product_product_10-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_11-image.png b/addons/product/static/img/product_product_11-image.png
index 156e5ebd376..b08a419987b 100644
Binary files a/addons/product/static/img/product_product_11-image.png and b/addons/product/static/img/product_product_11-image.png differ
diff --git a/addons/product/static/img/product_product_12-image.png b/addons/product/static/img/product_product_12-image.png
index d606721f4fb..e26d55e9096 100644
Binary files a/addons/product/static/img/product_product_12-image.png and b/addons/product/static/img/product_product_12-image.png differ
diff --git a/addons/product/static/img/product_product_13-image.jpg b/addons/product/static/img/product_product_13-image.jpg
new file mode 100644
index 00000000000..5180368c17d
Binary files /dev/null and b/addons/product/static/img/product_product_13-image.jpg differ
diff --git a/addons/product/static/img/product_product_13-image.png b/addons/product/static/img/product_product_13-image.png
deleted file mode 100644
index 96baa3d9948..00000000000
Binary files a/addons/product/static/img/product_product_13-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_16-image.jpg b/addons/product/static/img/product_product_16-image.jpg
new file mode 100644
index 00000000000..c09289aeafa
Binary files /dev/null and b/addons/product/static/img/product_product_16-image.jpg differ
diff --git a/addons/product/static/img/product_product_16-image.png b/addons/product/static/img/product_product_16-image.png
deleted file mode 100644
index dfbb75c960f..00000000000
Binary files a/addons/product/static/img/product_product_16-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_22-image.png b/addons/product/static/img/product_product_22-image.png
index aa581b69ceb..05a91424caa 100644
Binary files a/addons/product/static/img/product_product_22-image.png and b/addons/product/static/img/product_product_22-image.png differ
diff --git a/addons/product/static/img/product_product_24-image.jpg b/addons/product/static/img/product_product_24-image.jpg
new file mode 100644
index 00000000000..f5de1007b83
Binary files /dev/null and b/addons/product/static/img/product_product_24-image.jpg differ
diff --git a/addons/product/static/img/product_product_24-image.png b/addons/product/static/img/product_product_24-image.png
deleted file mode 100644
index f6a8ded9b18..00000000000
Binary files a/addons/product/static/img/product_product_24-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_25-image.png b/addons/product/static/img/product_product_25-image.png
index 947aa5498c9..70c10edbe77 100644
Binary files a/addons/product/static/img/product_product_25-image.png and b/addons/product/static/img/product_product_25-image.png differ
diff --git a/addons/product/static/img/product_product_27-image.jpg b/addons/product/static/img/product_product_27-image.jpg
new file mode 100644
index 00000000000..9ddacaca6e2
Binary files /dev/null and b/addons/product/static/img/product_product_27-image.jpg differ
diff --git a/addons/product/static/img/product_product_27-image.png b/addons/product/static/img/product_product_27-image.png
deleted file mode 100644
index 8c54433bd14..00000000000
Binary files a/addons/product/static/img/product_product_27-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_3-image.jpg b/addons/product/static/img/product_product_3-image.jpg
index 33884c0bc68..ee7ff61d97c 100644
Binary files a/addons/product/static/img/product_product_3-image.jpg and b/addons/product/static/img/product_product_3-image.jpg differ
diff --git a/addons/product/static/img/product_product_43-image.jpg b/addons/product/static/img/product_product_43-image.jpg
index 3bab8a3f95e..b31ca2faff2 100644
Binary files a/addons/product/static/img/product_product_43-image.jpg and b/addons/product/static/img/product_product_43-image.jpg differ
diff --git a/addons/product/static/img/product_product_46-image.jpg b/addons/product/static/img/product_product_46-image.jpg
new file mode 100644
index 00000000000..0a78e77c648
Binary files /dev/null and b/addons/product/static/img/product_product_46-image.jpg differ
diff --git a/addons/product/static/img/product_product_46-image.png b/addons/product/static/img/product_product_46-image.png
deleted file mode 100644
index d9525984b2b..00000000000
Binary files a/addons/product/static/img/product_product_46-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_5-image.jpg b/addons/product/static/img/product_product_5-image.jpg
new file mode 100644
index 00000000000..2e5496e107f
Binary files /dev/null and b/addons/product/static/img/product_product_5-image.jpg differ
diff --git a/addons/product/static/img/product_product_5-image.png b/addons/product/static/img/product_product_5-image.png
deleted file mode 100644
index 53d161e2a50..00000000000
Binary files a/addons/product/static/img/product_product_5-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_6-image.jpg b/addons/product/static/img/product_product_6-image.jpg
new file mode 100644
index 00000000000..917d8bedc5c
Binary files /dev/null and b/addons/product/static/img/product_product_6-image.jpg differ
diff --git a/addons/product/static/img/product_product_6-image.png b/addons/product/static/img/product_product_6-image.png
deleted file mode 100644
index a6c0299f213..00000000000
Binary files a/addons/product/static/img/product_product_6-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_7-image.png b/addons/product/static/img/product_product_7-image.png
index 7ee0a189904..3d535e23e0d 100644
Binary files a/addons/product/static/img/product_product_7-image.png and b/addons/product/static/img/product_product_7-image.png differ
diff --git a/addons/product/static/img/product_product_8-image.png b/addons/product/static/img/product_product_8-image.png
index acc3afcd0ac..5d86137084f 100644
Binary files a/addons/product/static/img/product_product_8-image.png and b/addons/product/static/img/product_product_8-image.png differ
diff --git a/addons/product/static/img/product_product_9-image.jpg b/addons/product/static/img/product_product_9-image.jpg
new file mode 100644
index 00000000000..a79c605ae21
Binary files /dev/null and b/addons/product/static/img/product_product_9-image.jpg differ
diff --git a/addons/product/static/img/product_product_9-image.png b/addons/product/static/img/product_product_9-image.png
deleted file mode 100644
index 580f1c3c7fd..00000000000
Binary files a/addons/product/static/img/product_product_9-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_d01-image.jpg b/addons/product/static/img/product_product_d01-image.jpg
new file mode 100644
index 00000000000..f64a0e84df9
Binary files /dev/null and b/addons/product/static/img/product_product_d01-image.jpg differ
diff --git a/addons/product/static/img/product_product_d01-image.png b/addons/product/static/img/product_product_d01-image.png
deleted file mode 100644
index 28e1a8d584e..00000000000
Binary files a/addons/product/static/img/product_product_d01-image.png and /dev/null differ
diff --git a/addons/product/static/img/product_product_d03-image.png b/addons/product/static/img/product_product_d03-image.png
index 854660b5ae6..3972b3f589a 100644
Binary files a/addons/product/static/img/product_product_d03-image.png and b/addons/product/static/img/product_product_d03-image.png differ
diff --git a/addons/product/static/img/table01.jpg b/addons/product/static/img/table01.jpg
new file mode 100644
index 00000000000..f0759907d76
Binary files /dev/null and b/addons/product/static/img/table01.jpg differ
diff --git a/addons/product/static/img/table01.png b/addons/product/static/img/table01.png
deleted file mode 100644
index 9aa8ef1d89c..00000000000
Binary files a/addons/product/static/img/table01.png and /dev/null differ
diff --git a/addons/product/static/img/table02.jpg b/addons/product/static/img/table02.jpg
new file mode 100644
index 00000000000..0d0e29cd21a
Binary files /dev/null and b/addons/product/static/img/table02.jpg differ
diff --git a/addons/product/static/img/table02.png b/addons/product/static/img/table02.png
deleted file mode 100644
index 5291a47f1b2..00000000000
Binary files a/addons/product/static/img/table02.png and /dev/null differ
diff --git a/addons/product/static/img/table03.jpg b/addons/product/static/img/table03.jpg
new file mode 100644
index 00000000000..764897cd892
Binary files /dev/null and b/addons/product/static/img/table03.jpg differ
diff --git a/addons/product/static/img/table03.png b/addons/product/static/img/table03.png
deleted file mode 100644
index 9da4c6370d4..00000000000
Binary files a/addons/product/static/img/table03.png and /dev/null differ
diff --git a/addons/product/static/img/table04.jpg b/addons/product/static/img/table04.jpg
new file mode 100644
index 00000000000..06421fb4fec
Binary files /dev/null and b/addons/product/static/img/table04.jpg differ
diff --git a/addons/product/static/img/table04.png b/addons/product/static/img/table04.png
deleted file mode 100644
index 28fdd46b025..00000000000
Binary files a/addons/product/static/img/table04.png and /dev/null differ
diff --git a/addons/sale/static/img/floor_protection-image.jpg b/addons/sale/static/img/floor_protection-image.jpg
new file mode 100644
index 00000000000..d9738fa7540
Binary files /dev/null and b/addons/sale/static/img/floor_protection-image.jpg differ
diff --git a/addons/sale/static/img/floor_protection-image.png b/addons/sale/static/img/floor_protection-image.png
deleted file mode 100644
index ef540b90c91..00000000000
Binary files a/addons/sale/static/img/floor_protection-image.png and /dev/null differ
diff --git a/addons/sale_product_configurator/data/sale_demo.xml b/addons/sale_product_configurator/data/sale_demo.xml
index 117ebd6acc0..589f8ef8497 100644
--- a/addons/sale_product_configurator/data/sale_demo.xml
+++ b/addons/sale_product_configurator/data/sale_demo.xml
@@ -9,7 +9,7 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">Office chairs can harm your floor: protect it.</field>
-            <field name="image_1920" type="base64" file="sale/static/img/floor_protection-image.png"/>
+            <field name="image_1920" type="base64" file="sale/static/img/floor_protection-image.jpg"/>
         </record>
 
         <record id="product.product_product_4_product_template" model="product.template">
diff --git a/addons/stock/static/img/cable_management.png b/addons/stock/static/img/cable_management.png
index bddc79b8ed2..f432f9e37a5 100644
Binary files a/addons/stock/static/img/cable_management.png and b/addons/stock/static/img/cable_management.png differ
diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index 7e297a3f89a..41056fad5f7 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -60,8 +60,6 @@
 
         <record id="product.product_product_4" model="product.product">
             <field name="is_published" eval="True"/>
-            <field name="website_size_x">2</field>
-            <field name="website_size_y">2</field>
             <field name="website_sequence">9950</field>
             <field name="website_description" type="html">
                 <section class="s_text_image pt32 pb32 o_colored_level o_cc o_cc1" data-snippet="s_text_image" data-name="Text - Image">
@@ -691,7 +689,7 @@
             <field name="categ_id" ref="product.product_category_3"/>
             <field name="invoice_policy">delivery</field>
             <field name="public_categ_ids" eval="[(6, 0, [ref('website_sale.services')])]"/>
-            <field name="image_1920" type="base64" file="website_sale/static/src/img/warranty.png"/>
+            <field name="image_1920" type="base64" file="website_sale/static/src/img/warranty.jpg"/>
         </record>
 
         <record id="product_1_attribute_3_product_template_attribute_line" model="product.template.attribute.line">
diff --git a/addons/website_sale/static/src/img/warranty.jpg b/addons/website_sale/static/src/img/warranty.jpg
new file mode 100644
index 00000000000..bd9a0a56a5c
Binary files /dev/null and b/addons/website_sale/static/src/img/warranty.jpg differ
diff --git a/addons/website_sale/static/src/img/warranty.png b/addons/website_sale/static/src/img/warranty.png
deleted file mode 100644
index 8c778502ea2..00000000000
Binary files a/addons/website_sale/static/src/img/warranty.png and /dev/null differ
diff --git a/addons/website_sale_digital/static/digital_product_1.jpg b/addons/website_sale_digital/static/digital_product_1.jpg
index a39242bc616..bdeae9de089 100644
Binary files a/addons/website_sale_digital/static/digital_product_1.jpg and b/addons/website_sale_digital/static/digital_product_1.jpg differ