diff --git a/addons/mass_mailing/data/ir_attachment_data.xml b/addons/mass_mailing/data/ir_attachment_data.xml
index 97bf71c8e9b..041795edf58 100644
--- a/addons/mass_mailing/data/ir_attachment_data.xml
+++ b/addons/mass_mailing/data/ir_attachment_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="0">
+    <data>
         <!-- Snippets' Default Images -->
         <record id="mass_mailing.s_cover_default_image" model="ir.attachment">
             <field name="public" eval="True"/>
diff --git a/addons/mass_mailing/static/image_shapes/basic/slanted.svg b/addons/mass_mailing/static/image_shapes/basic/slanted.svg
deleted file mode 100644
index 134fbc19359..00000000000
--- a/addons/mass_mailing/static/image_shapes/basic/slanted.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
-
-<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
diff --git a/addons/mass_mailing/static/image_shapes/basic/triangle.svg b/addons/mass_mailing/static/image_shapes/basic/triangle.svg
deleted file mode 100644
index 13df53ed55a..00000000000
--- a/addons/mass_mailing/static/image_shapes/basic/triangle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
-
-<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M1,1L0,0h1V1z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
diff --git a/addons/mass_mailing/views/snippets/s_blockquote.xml b/addons/mass_mailing/views/snippets/s_blockquote.xml
index e3ed697e639..2d1fd2e9bd7 100644
--- a/addons/mass_mailing/views/snippets/s_blockquote.xml
+++ b/addons/mass_mailing/views/snippets/s_blockquote.xml
@@ -12,7 +12,7 @@
                     <div>
                         <p><i>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</i></p>
                         <div>
-                            <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" style="width: 40px" class="img me-2" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                            <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/web_editor/geometric_round/geo_round_circle.svg" style="width: 40px" class="img me-2" data-shape="web_editor/geometric_round/geo_round_circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             <p style="font-weight: bolder; font-size: 14px;"><b>John DOE</b> &#8226; CEO of MyCompany</p>
                         </div>
                     </div>
diff --git a/addons/mass_mailing/views/snippets/s_company_team.xml b/addons/mass_mailing/views/snippets/s_company_team.xml
index 4fc56f0d348..6670cf6ee7c 100644
--- a/addons/mass_mailing/views/snippets/s_company_team.xml
+++ b/addons/mass_mailing/views/snippets/s_company_team.xml
@@ -9,7 +9,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 pb16 px-0">
-                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_1/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_1/web_editor/geometric_round/geo_round_circle.svg" class="img-fluid mx-auto" data-shape="web_editor/geometric_round/geo_round_circle" data-file-name="team_member_1-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Tony Fred, CEO</h3>
@@ -22,7 +22,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/web_editor/geometric_round/geo_round_circle.svg" class="img-fluid mx-auto" data-shape="web_editor/geometric_round/geo_round_circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Mich Stark, COO</h3>
@@ -35,7 +35,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_3/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_3/web_editor/geometric_round/geo_round_circle.svg" class="img-fluid mx-auto" data-shape="web_editor/geometric_round/geo_round_circle" data-file-name="team_member_3-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Aline Turner, CTO</h3>
@@ -48,7 +48,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_4/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_4/web_editor/geometric_round/geo_round_circle.svg" class="img-fluid mx-auto" data-shape="web_editor/geometric_round/geo_round_circle" data-file-name="team_member_4-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Iris Joe, CFO</h3>
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 078cf2ff991..65417627c4f 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -318,16 +318,6 @@
         <attribute name="t-value">True</attribute>
     </xpath>
 
-    <!-- Extra shapes -->
-    <xpath expr="//div[hasclass('o_we_image_shape')]//we-select-page[hasclass('o_we_basic_shapes')]" position="inside">
-        <we-button data-set-img-shape="mass_mailing/basic/circle" data-select-label="Circle"/>
-        <we-button data-set-img-shape="mass_mailing/basic/triangle" data-select-label="Triangle"/>
-        <we-button data-set-img-shape="mass_mailing/basic/slanted" data-select-label="Slanted"/>
-    </xpath>
-    <xpath expr="//div[hasclass('o_we_image_shape')]//we-select-page[hasclass('o_we_basic_shapes')]" position="attributes">
-        <attribute name="t-if">True</attribute>
-    </xpath>
-
     <!-- Image styles -->
     <!-- TODO review to only modify what's really necessary and potentially -->
     <!-- make the changes in web_editor directly so that website can benefit -->
diff --git a/addons/mass_mailing_themes/__manifest__.py b/addons/mass_mailing_themes/__manifest__.py
index c28875823f8..ec5023a0780 100644
--- a/addons/mass_mailing_themes/__manifest__.py
+++ b/addons/mass_mailing_themes/__manifest__.py
@@ -15,6 +15,7 @@ Design gorgeous mails
         'mass_mailing',
     ],
     'data': [
+        'data/ir_attachment_data.xml',
         'views/mass_mailing_themes_templates.xml'
     ],
     'installable': True,
diff --git a/addons/mass_mailing_themes/data/ir_attachment_data.xml b/addons/mass_mailing_themes/data/ir_attachment_data.xml
new file mode 100644
index 00000000000..b4ad74b97e1
--- /dev/null
+++ b/addons/mass_mailing_themes/data/ir_attachment_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="mass_mailing_themes.s_tech_default_image" model="ir.attachment">
+            <field name="public" eval="True"/>
+            <field name="name">s_tech_default_image.jpg</field>
+            <field name="type">url</field>
+            <field name="url">/mass_mailing_themes/static/src/img/theme_tech/s_tech_default_image.jpg</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg
deleted file mode 100644
index 7ba2845d1a0..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg and /dev/null differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/s_tech_default_image.jpg b/addons/mass_mailing_themes/static/src/img/theme_tech/s_tech_default_image.jpg
new file mode 100644
index 00000000000..26e6a876d58
Binary files /dev/null and b/addons/mass_mailing_themes/static/src/img/theme_tech/s_tech_default_image.jpg differ
diff --git a/addons/mass_mailing_themes/static/src/img/theme_tech/text_image-triangle.png b/addons/mass_mailing_themes/static/src/img/theme_tech/text_image-triangle.png
deleted file mode 100644
index 45eed240c67..00000000000
Binary files a/addons/mass_mailing_themes/static/src/img/theme_tech/text_image-triangle.png and /dev/null differ
diff --git a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
index a3f8348e00c..d52e02ea82a 100644
--- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
@@ -218,7 +218,7 @@
                         <p style="text-align:left;"><a class="btn btn-primary rounded-circle" href="#">VISIT OUR WEBSITE</a></p>
                     </div>
                     <div class="col-lg-5 px-0">
-                        <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-original-id="242" data-original-src="/mass_mailing_themes/static/src/img/theme_tech/s_default_image_text_image.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/triangle" data-file-name="text_image-triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
+                        <img class="img-fluid o_we_custom_image" src="/web_editor/image_shape/mass_mailing_themes.s_tech_default_image/web_editor/geometric/geo_cornered_triangle.svg" data-shape="web_editor/geometric/geo_cornered_triangle" data-file-name="text_image-cornered_triangle.svg" data-shape-colors=";;;;" data-original-mimetype="image/jpeg"/>
                     </div>
                 </div>
             </div>
diff --git a/addons/web_editor/static/image_shapes/brushed/brush_1.svg b/addons/web_editor/static/image_shapes/brushed/brush_1.svg
new file mode 100644
index 00000000000..e678941e21b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/brushed/brush_1.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4281,0.0681C0.4281,0.0305,0.4603,0,0.5,0C0.5397,0,0.5719,0.0305,0.5719,0.0681V0.1326C0.5779,0.1008,0.6073,0.0766,0.6427,0.0766C0.6824,0.0766,0.7146,0.1071,0.7146,0.1447V0.2432C0.7206,0.2114,0.75,0.1872,0.7854,0.1872C0.8251,0.1872,0.8573,0.2177,0.8573,0.2553V0.3539C0.8633,0.322,0.8927,0.2979,0.9281,0.2979C0.9678,0.2979,1,0.3284,1,0.366V0.5872C1,0.6248,0.9678,0.6553,0.9281,0.6553C0.8927,0.6553,0.8633,0.6312,0.8573,0.5993V0.7489C0.8573,0.7865,0.8251,0.817,0.7854,0.817C0.75,0.817,0.7206,0.7929,0.7146,0.761V0.8596C0.7146,0.8972,0.6824,0.9277,0.6427,0.9277C0.6073,0.9277,0.5779,0.9035,0.5719,0.8716V0.9319C0.5719,0.9695,0.5397,1,0.5,1C0.4603,1,0.4281,0.9695,0.4281,0.9319V0.8716C0.4221,0.9035,0.3927,0.9277,0.3573,0.9277C0.3176,0.9277,0.2854,0.8972,0.2854,0.8596V0.761C0.2794,0.7929,0.25,0.817,0.2146,0.817C0.1749,0.817,0.1427,0.7865,0.1427,0.7489V0.5993C0.1367,0.6312,0.1073,0.6553,0.0719,0.6553C0.0322,0.6553,0,0.6248,0,0.5872V0.366C0,0.3284,0.0322,0.2979,0.0719,0.2979C0.1073,0.2979,0.1367,0.322,0.1427,0.3539V0.2553C0.1427,0.2177,0.1749,0.1872,0.2146,0.1872C0.25,0.1872,0.2794,0.2114,0.2854,0.2432V0.1447C0.2854,0.1071,0.3176,0.0766,0.3573,0.0766C0.3927,0.0766,0.4221,0.1008,0.4281,0.1326V0.0681Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/brushed/brush_2.svg b/addons/web_editor/static/image_shapes/brushed/brush_2.svg
new file mode 100644
index 00000000000..bd3c076dfab
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/brushed/brush_2.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.6299,0.0288C0.6606-0.0096,0.7103-0.0096,0.741,0.0288C0.7686,0.0634,0.7713,0.1173,0.7492,0.1557L0.84,0.042C0.8706,0.0036,0.9203,0.0036,0.951,0.042C0.9817,0.0803,0.9817,0.1426,0.951,0.1809L0.8542,0.3021C0.8849,0.2645,0.9341,0.2648,0.9646,0.3029C0.9952,0.3413,0.9952,0.4035,0.9646,0.4419L0.8935,0.5308C0.9216,0.5174,0.9544,0.5249,0.977,0.5531C1.0077,0.5915,1.0077,0.6537,0.977,0.6921L0.8374,0.8669C0.8067,0.9052,0.757,0.9052,0.7264,0.8669C0.7038,0.8386,0.6979,0.7975,0.7085,0.7624L0.5417,0.9712C0.511,1.0096,0.4613,1.0096,0.4307,0.9712C0.4002,0.9331,0.4,0.8715,0.4301,0.8331L0.3226,0.9675C0.292,1.0059,0.2423,1.0059,0.2116,0.9675C0.181,0.9292,0.181,0.8669,0.2116,0.8286L0.2168,0.8221C0.1861,0.8498,0.1431,0.8464,0.1154,0.8118C0.0852,0.774,0.0848,0.7129,0.1142,0.6745C0.0847,0.6933,0.0477,0.6873,0.023,0.6564C-0.0077,0.618-0.0077,0.5558,0.023,0.5174L0.2785,0.1976C0.3091,0.1592,0.3588,0.1592,0.3895,0.1976C0.4142,0.2285,0.419,0.2748,0.404,0.3117L0.6299,0.0288Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/brushed/brush_3.svg b/addons/web_editor/static/image_shapes/brushed/brush_3.svg
new file mode 100644
index 00000000000..25afa96887c
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/brushed/brush_3.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5825,1C0.628,1,0.6649,0.9453,0.6649,0.8779V0.7643C0.6714,0.8247,0.7068,0.871,0.7495,0.871C0.7967,0.871,0.8351,0.8142,0.8351,0.7442V0.6208C0.8354,0.6878,0.8722,0.7419,0.9175,0.7419C0.9631,0.7419,1,0.6873,1,0.6198V0.3848C1,0.3173,0.9631,0.2627,0.9175,0.2627C0.8722,0.2627,0.8354,0.3168,0.8351,0.3838V0.2558C0.8351,0.1858,0.7967,0.129,0.7495,0.129C0.7068,0.129,0.6714,0.1753,0.6649,0.2357V0.1221C0.6649,0.0547,0.628,0,0.5825,0C0.5371,0,0.5004,0.0541,0.5,0.1211C0.4996,0.0541,0.4629,0,0.4175,0C0.372,0,0.3351,0.0547,0.3351,0.1221V0.2357C0.3286,0.1753,0.2932,0.129,0.2505,0.129C0.2033,0.129,0.1649,0.1858,0.1649,0.2558V0.3838C0.1646,0.3168,0.1278,0.2627,0.0825,0.2627C0.0369,0.2627,0,0.3173,0,0.3848V0.6198C0,0.6873,0.0369,0.7419,0.0825,0.7419C0.1278,0.7419,0.1646,0.6878,0.1649,0.6208V0.7442C0.1649,0.8142,0.2033,0.871,0.2505,0.871C0.2932,0.871,0.3286,0.8247,0.3351,0.7643V0.8779C0.3351,0.9453,0.372,1,0.4175,1C0.4629,1,0.4996,0.9459,0.5,0.8789C0.5004,0.9459,0.5371,1,0.5825,1Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/brushed/brush_4.svg b/addons/web_editor/static/image_shapes/brushed/brush_4.svg
new file mode 100644
index 00000000000..40276420a66
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/brushed/brush_4.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0C0.2239,0,0,0.1705,0,0.3808V0.6667C0.0769,0.7139,0.1539,0.7663,0.2308,0.8241C0.2891,0.8556,0.3366,0.8778,0.3733,0.8907C0.4454,0.9205,0.517,0.9391,0.5882,0.9465C0.6229,0.9497,0.6554,0.9464,0.6856,0.9366C0.6944,0.934,0.7235,0.9275,0.726,0.9307C0.7159,0.932,0.7109,0.9373,0.7061,0.9423C0.7031,0.9454,0.7002,0.9485,0.6961,0.9505C0.6455,0.9675,0.5874,0.9688,0.5218,0.9546C0.651,1.0016,0.745,1.0121,0.8039,0.9862C0.8232,0.9777,0.8423,0.9631,0.8611,0.9426L0.8623,0.942C0.864,0.9343,0.8651,0.9258,0.8658,0.9168C0.8706,0.8408,0.8799,0.7765,0.8937,0.7238C0.9129,0.6582,0.9478,0.6143,0.9987,0.5919C0.9991,0.5917,0.9996,0.5915,1,0.5913V0.5396C0.9903,0.5423,0.9808,0.5457,0.9716,0.5498C0.9546,0.5572,0.9384,0.567,0.9228,0.5791C0.918,0.5791,0.9079,0.5844,0.9079,0.5844C0.9079,0.5844,0.9079,0.5781,0.9136,0.5713C0.9356,0.5449,0.9611,0.5254,0.9901,0.5126C0.9934,0.5112,0.9967,0.5098,1,0.5086V0.3808C1,0.1705,0.7761,0,0.5,0ZM0.0003,0.7375C0.0203,0.7502,0.0406,0.7626,0.0611,0.7747C0.1008,0.7986,0.1401,0.8235,0.1791,0.8494C0.116,0.7986,0.0563,0.7451,0,0.689V0.7232C0,0.728,0.0001,0.7327,0.0003,0.7375Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/composite/composite_cut_circle.svg b/addons/web_editor/static/image_shapes/composite/composite_cut_circle.svg
new file mode 100644
index 00000000000..217e9d89475
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/composite/composite_cut_circle.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M 0.0199 0.4808 C 0.0199 0.2741 0.1902 0.1065 0.4002 0.1065 C 0.6103 0.1065 0.7806 0.2741 0.7806 0.4808 L 0.0199 0.4808 Z M 0.9858 0.4808 C 0.9858 0.692 0.8164 0.8632 0.6075 0.8632 C 0.3985 0.8632 0.2291 0.692 0.2291 0.4808 H 0.9858 Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/composite/composite_double_pill.svg b/addons/web_editor/static/image_shapes/composite/composite_double_pill.svg
new file mode 100644
index 00000000000..2552cbab95c
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/composite/composite_double_pill.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.2521,0C0.1129,0,0,0.1129,0,0.2521C0,0.3912,0.1127,0.504,0.2517,0.5042H0.2479C0.111,0.5042,0,0.6152,0,0.7521C0,0.889,0.111,1,0.2479,1H0.7521C0.889,1,1,0.889,1,0.7521C1,0.6152,0.889,0.5042,0.7521,0.5042H0.7483C0.8873,0.504,1,0.3912,1,0.2521C1,0.1129,0.8871,0,0.7479,0H0.2521Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/composite/composite_half_circle.svg b/addons/web_editor/static/image_shapes/composite/composite_half_circle.svg
new file mode 100644
index 00000000000..66cf7e842dc
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/composite/composite_half_circle.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5C0,0.2239,0.2239,0,0.5,0C0.7761,0,1,0.2239,1,0.5L0,0.5ZM0,1C0,0.7239,0.2239,0.5,0.5,0.5C0.7761,0.5,1,0.7239,1,1L0,1Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/composite/composite_sonar.svg b/addons/web_editor/static/image_shapes/composite/composite_sonar.svg
new file mode 100644
index 00000000000..9a0cafc3929
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/composite/composite_sonar.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.1557C0.2761-0.0519,0.7239-0.0519,1,0.1557L0.5799,0.4717C0.7334,0.4847,0.8823,0.5355,1,0.624L0.5,1L0,0.624C0.1177,0.5355,0.2666,0.4847,0.4201,0.4717L0,0.1557Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/composite/composite_triple_pill.svg b/addons/web_editor/static/image_shapes/composite/composite_triple_pill.svg
new file mode 100644
index 00000000000..5af22bbf8dd
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/composite/composite_triple_pill.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.1703C0,0.0762,0.0746,0,0.1667,0H0.8333C0.9254,0,1,0.0762,1,0.1703C1,0.2495,0.9471,0.3161,0.8754,0.3352C0.9471,0.3542,1,0.4208,1,0.5C1,0.5792,0.9471,0.6458,0.8754,0.6648C0.9471,0.6839,1,0.7505,1,0.8297C1,0.9238,0.9254,1,0.8333,1H0.1667C0.0746,1,0,0.9238,0,0.8297C0,0.7505,0.0529,0.6839,0.1247,0.6648C0.0529,0.6458,0,0.5792,0,0.5C0,0.4208,0.0529,0.3542,0.1246,0.3352C0.0529,0.3161,0,0.2495,0,0.1703Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/line/little_lines_1.svg b/addons/web_editor/static/image_shapes/composition/composition_line_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/line/little_lines_1.svg
rename to addons/web_editor/static/image_shapes/composition/composition_line_1.svg
index 80f30dfeb77..c98a19dc48f 100644
--- a/addons/web_editor/static/image_shapes/line/little_lines_1.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_line_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/line/little_lines_2.svg b/addons/web_editor/static/image_shapes/composition/composition_line_2.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/line/little_lines_2.svg
rename to addons/web_editor/static/image_shapes/composition/composition_line_2.svg
index 96354a04bb6..8a45067131e 100644
--- a/addons/web_editor/static/image_shapes/line/little_lines_2.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_line_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/line/little_lines_3.svg b/addons/web_editor/static/image_shapes/composition/composition_line_3.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/line/little_lines_3.svg
rename to addons/web_editor/static/image_shapes/composition/composition_line_3.svg
index 51eedb256b9..8db96bf0f07 100644
--- a/addons/web_editor/static/image_shapes/line/little_lines_3.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_line_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
       <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
           <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/float/flt_primary_1.svg b/addons/web_editor/static/image_shapes/composition/composition_mixed_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_primary_1.svg
rename to addons/web_editor/static/image_shapes/composition/composition_mixed_1.svg
index 7556a4fb3ec..3219c4e51c1 100644
--- a/addons/web_editor/static/image_shapes/float/flt_primary_1.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_mixed_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
   <style>
     @keyframes rotate {
       from {transform: rotate(45deg) scale(.7);}
diff --git a/addons/web_editor/static/image_shapes/float/flt_primary_2.svg b/addons/web_editor/static/image_shapes/composition/composition_mixed_2.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_primary_2.svg
rename to addons/web_editor/static/image_shapes/composition/composition_mixed_2.svg
index f0cc8cdff93..eebf929fa35 100644
--- a/addons/web_editor/static/image_shapes/float/flt_primary_2.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_mixed_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
   <style>
     @keyframes rotate {
       from {transform: rotate(0deg);}
diff --git a/addons/web_editor/static/image_shapes/line/organic_1_line.svg b/addons/web_editor/static/image_shapes/composition/composition_organic_line.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/line/organic_1_line.svg
rename to addons/web_editor/static/image_shapes/composition/composition_organic_line.svg
index 25e1115da4e..8a43bb5f478 100644
--- a/addons/web_editor/static/image_shapes/line/organic_1_line.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_organic_line.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
       <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/line/oval_2_line.svg b/addons/web_editor/static/image_shapes/composition/composition_oval_line.svg
similarity index 96%
rename from addons/web_editor/static/image_shapes/line/oval_2_line.svg
rename to addons/web_editor/static/image_shapes/composition/composition_oval_line.svg
index c96baf591a4..769065bd5aa 100644
--- a/addons/web_editor/static/image_shapes/line/oval_2_line.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_oval_line.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
       <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/float/flt_planets_1.svg b/addons/web_editor/static/image_shapes/composition/composition_planet_1.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/float/flt_planets_1.svg
rename to addons/web_editor/static/image_shapes/composition/composition_planet_1.svg
index ab8eae8a9ec..3d9b35f22cb 100644
--- a/addons/web_editor/static/image_shapes/float/flt_planets_1.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_planet_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/float/flt_planets_2.svg b/addons/web_editor/static/image_shapes/composition/composition_planet_2.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/float/flt_planets_2.svg
rename to addons/web_editor/static/image_shapes/composition/composition_planet_2.svg
index afd938782d1..889953d0498 100644
--- a/addons/web_editor/static/image_shapes/float/flt_planets_2.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_planet_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
   <style>
     @keyframes scale_1 {
       0%, 100% {transform: scale(1);}
diff --git a/addons/web_editor/static/image_shapes/float/flt_square_1.svg b/addons/web_editor/static/image_shapes/composition/composition_square_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_square_1.svg
rename to addons/web_editor/static/image_shapes/composition/composition_square_1.svg
index 105162da79f..7764c1f48b3 100644
--- a/addons/web_editor/static/image_shapes/float/flt_square_1.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_square_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/float/flt_square_2.svg b/addons/web_editor/static/image_shapes/composition/composition_square_2.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_square_2.svg
rename to addons/web_editor/static/image_shapes/composition/composition_square_2.svg
index aa679f2067b..0c8f4abbf91 100644
--- a/addons/web_editor/static/image_shapes/float/flt_square_2.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_square_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/float/flt_square_3.svg b/addons/web_editor/static/image_shapes/composition/composition_square_3.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_square_3.svg
rename to addons/web_editor/static/image_shapes/composition/composition_square_3.svg
index 358c75ab672..0328fe8303b 100644
--- a/addons/web_editor/static/image_shapes/float/flt_square_3.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_square_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
   <style>
     @keyframes rotate {
       from {transform: rotate(0deg);}
diff --git a/addons/web_editor/static/image_shapes/float/flt_square_4.svg b/addons/web_editor/static/image_shapes/composition/composition_square_4.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_square_4.svg
rename to addons/web_editor/static/image_shapes/composition/composition_square_4.svg
index 2a5758f9ead..c7dfe6a2e84 100644
--- a/addons/web_editor/static/image_shapes/float/flt_square_4.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_square_4.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="shape" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/line/line_square_1.svg b/addons/web_editor/static/image_shapes/composition/composition_square_line.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/line/line_square_1.svg
rename to addons/web_editor/static/image_shapes/composition/composition_square_line.svg
index 57644889428..5aaf33f049d 100644
--- a/addons/web_editor/static/image_shapes/line/line_square_1.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_square_line.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="60" id="shape">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600" id="shape">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/line/line_triangle.svg b/addons/web_editor/static/image_shapes/composition/composition_triangle_line.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/line/line_triangle.svg
rename to addons/web_editor/static/image_shapes/composition/composition_triangle_line.svg
index e0c5283475d..0193be5acdc 100644
--- a/addons/web_editor/static/image_shapes/line/line_triangle.svg
+++ b/addons/web_editor/static/image_shapes/composition/composition_triangle_line.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <style>
         @keyframes rotate {
             0%, 100% {transform: rotate(45deg) scale(.8);}
diff --git a/addons/web_editor/static/image_shapes/convert-to-percentages.js b/addons/web_editor/static/image_shapes/convert-to-percentages.js
index 2fb4ca601c7..acf8af91e7f 100644
--- a/addons/web_editor/static/image_shapes/convert-to-percentages.js
+++ b/addons/web_editor/static/image_shapes/convert-to-percentages.js
@@ -123,7 +123,7 @@ submitButton.addEventListener('click', async (ev) => {
 
         const svgPreviewEl = svg.createElementNS('http://www.w3.org/2000/svg', 'svg');
         svgPreviewEl.setAttributeNS('http://www.w3.org/2000/svg', 'viewBox', '0 0 1 1');
-        svgPreviewEl.setAttribute('width', '800');
+        svgPreviewEl.setAttribute('width', '600');
         svgPreviewEl.setAttribute('height', '600');
         svgPreviewEl.setAttribute('id', 'preview');
         svgPreviewEl.setAttributeNS('http://www.w3.org/2000/svg', 'preserveAspectRatio', 'none');
@@ -137,7 +137,7 @@ submitButton.addEventListener('click', async (ev) => {
         imageEl.setAttribute('clip-path', 'url(#clip-path)');
         svgDocumentElement.appendChild(imageEl);
         // Give a default size to the SVGs for an easier preview on disk
-        svgDocumentElement.setAttribute('width', '800');
+        svgDocumentElement.setAttribute('width', '600');
         svgDocumentElement.setAttribute('height', '600');
 
         const outFile = new File([svgDocumentElement.outerHTML], filePicker.files[0].name, { type: 'image/svg+xml' });
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_cornered_triangle.svg b/addons/web_editor/static/image_shapes/geometric/geo_cornered_triangle.svg
new file mode 100644
index 00000000000..69163283edc
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_cornered_triangle.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="600">
+  <defs>
+    <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+      <use xlink:href="#filterPath" fill="none"/>
+    </clipPath>
+    <path id="filterPath" d="M1,1L0,0h1V1z"></path>
+  </defs>
+  <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+    <use xlink:href="#filterPath" fill="darkgrey"/>
+  </svg>
+  <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_diamond.svg b/addons/web_editor/static/image_shapes/geometric/geo_diamond.svg
new file mode 100644
index 00000000000..f6da7579c9f
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_diamond.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M 0.5 0 L 0 0.5 L 0.5 1 L 1 0.5 L 0.5 0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_door.svg b/addons/web_editor/static/image_shapes/geometric/geo_door.svg
new file mode 100644
index 00000000000..150d550e087
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_door.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5C0,0.2239,0.2239,0,0.5,0C0.7761,0,1,0.2239,1,0.5V1H0V0.5Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_emerald.svg b/addons/web_editor/static/image_shapes/geometric/geo_emerald.svg
new file mode 100644
index 00000000000..52ed7fd4172
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_emerald.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0L0.625,0L1,0.5V1H0.375L0,0.5V0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_gem.svg b/addons/web_editor/static/image_shapes/geometric/geo_gem.svg
new file mode 100644
index 00000000000..a0d4d73bdba
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_gem.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0H0.5L1,0.5V1H0V0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_heptagon.svg b/addons/web_editor/static/image_shapes/geometric/geo_heptagon.svg
new file mode 100644
index 00000000000..d748766dad7
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_heptagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L0.901,0.1981L1,0.6431L0.7225,1H0.2775L0,0.6431L0.099,0.1981L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_hexagon.svg b/addons/web_editor/static/image_shapes/geometric/geo_hexagon.svg
new file mode 100644
index 00000000000..12e36562662
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_hexagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L1,0.25V0.75L0.5,1L0,0.75V0.25L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_kayak.svg b/addons/web_editor/static/image_shapes/geometric/geo_kayak.svg
new file mode 100644
index 00000000000..a47851cba6a
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_kayak.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,1C0,0.4477,0.4477,0,1,0C1,0.5523,0.5523,1,0,1Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_pentagon.svg b/addons/web_editor/static/image_shapes/geometric/geo_pentagon.svg
new file mode 100644
index 00000000000..c31fa0a0ad1
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_pentagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L1,0.382L0.809,1H0.191L0,0.382L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_shuriken.svg b/addons/web_editor/static/image_shapes/geometric/geo_shuriken.svg
new file mode 100644
index 00000000000..5609b8d5085
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_shuriken.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0L0.5,0.04L1,0L0.96,0.5L1,1L0.5,0.96L0,1L0.04,0.5L0,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_slanted.svg b/addons/web_editor/static/image_shapes/geometric/geo_slanted.svg
new file mode 100644
index 00000000000..3b525c97777
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_slanted.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="600">
+  <defs>
+    <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+      <use xlink:href="#filterPath" fill="none"/>
+    </clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path>
+  </defs>
+  <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+    <use xlink:href="#filterPath" fill="darkgrey"/>
+  </svg><image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_sonar.svg b/addons/web_editor/static/image_shapes/geometric/geo_sonar.svg
new file mode 100644
index 00000000000..a7626c63dad
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_sonar.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0V0C0.5523,0,1,0.4477,1,1V1H0V0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_square.svg b/addons/web_editor/static/image_shapes/geometric/geo_square.svg
new file mode 100644
index 00000000000..1396c09d72a
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M 0 0 L 0 1 L 1 1 L 1 0 L 0 0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_1.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_1.svg
similarity index 97%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_1.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_1.svg
index ccfe8948892..d9b843dcff7 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_1.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_2.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_2.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_2.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_2.svg
index bb3265a7ba0..03ac9fdbc49 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_2.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_3.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_3.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_3.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_3.svg
index 3c5d1d75f9c..34f2097286b 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_3.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_4.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_4.svg
similarity index 96%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_4.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_4.svg
index 17c876308eb..d3570754711 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_4.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_4.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_5.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_5.svg
similarity index 94%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_5.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_5.svg
index 9d7337e416c..56f06d3b4cd 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_5.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_5.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_6.svg b/addons/web_editor/static/image_shapes/geometric/geo_square_6.svg
similarity index 94%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_6.svg
rename to addons/web_editor/static/image_shapes/geometric/geo_square_6.svg
index 1629f7447b8..b087c656468 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_6.svg
+++ b/addons/web_editor/static/image_shapes/geometric/geo_square_6.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_star.svg b/addons/web_editor/static/image_shapes/geometric/geo_star.svg
new file mode 100644
index 00000000000..93aa58c832d
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_star.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L0.7163,0.2397L1,0.382L0.85,0.6724L0.809,1L0.5,0.9397L0.191,1L0.15,0.6724L0,0.382L0.2837,0.2397L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_star_16pin.svg b/addons/web_editor/static/image_shapes/geometric/geo_star_16pin.svg
new file mode 100644
index 00000000000..f80cc53ef1b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_star_16pin.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L0.5687,0.1548L0.6913,0.0381L0.6956,0.2073L0.8536,0.1464L0.7927,0.3044L0.9619,0.3087L0.8452,0.4313L1,0.5L0.8452,0.5687L0.9619,0.6913L0.7927,0.6956L0.8536,0.8536L0.6956,0.7927L0.6913,0.9619L0.5687,0.8452L0.5,1L0.4313,0.8452L0.3087,0.9619L0.3044,0.7927L0.1464,0.8536L0.2073,0.6956L0.0381,0.6913L0.1548,0.5687L0,0.5L0.1548,0.4313L0.0381,0.3087L0.2073,0.3044L0.1464,0.1464L0.3044,0.2073L0.3087,0.0381L0.4313,0.1548L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_star_8pin.svg b/addons/web_editor/static/image_shapes/geometric/geo_star_8pin.svg
new file mode 100644
index 00000000000..bf9be1076b8
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_star_8pin.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L0.6347,0.1748L0.8536,0.1464L0.8252,0.3653L1,0.5L0.8252,0.6347L0.8536,0.8536L0.6347,0.8252L0.5,1L0.3653,0.8252L0.1464,0.8536L0.1748,0.6347L0,0.5L0.1748,0.3653L0.1464,0.1464L0.3653,0.1748L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_tear.svg b/addons/web_editor/static/image_shapes/geometric/geo_tear.svg
new file mode 100644
index 00000000000..8a542573926
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_tear.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5C0,0.2239,0.2239,0,0.5,0H1V0.5C1,0.7761,0.7761,1,0.5,1V1C0.2239,1,0,0.7761,0,0.5V0.5Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_tetris.svg b/addons/web_editor/static/image_shapes/geometric/geo_tetris.svg
new file mode 100644
index 00000000000..1f1d528281b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_tetris.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0L0,1L1,1L1,0.5H0.5L0.5,0L0,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_triangle.svg b/addons/web_editor/static/image_shapes/geometric/geo_triangle.svg
new file mode 100644
index 00000000000..f3e9bc236b1
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_triangle.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.5,0L1,1H0L0.5,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric/geo_triangle_corner.svg b/addons/web_editor/static/image_shapes/geometric/geo_triangle_corner.svg
new file mode 100644
index 00000000000..658fb50b867
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric/geo_triangle_corner.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="600">
+  <defs>
+    <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+      <use xlink:href="#filterPath" fill="none"/>
+    </clipPath>
+    <path id="filterPath" d="M1,1L0,0h1V1z"></path>
+  </defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+    <use xlink:href="#filterPath" fill="darkgrey"/>
+  </svg>
+  <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
\ No newline at end of file
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_organic_3.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_hard.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/basic/bsc_organic_3.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_hard.svg
index c39ed0765c4..d50270524d1 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_organic_3.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_hard.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_organic_2.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_medium.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/basic/bsc_organic_2.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_medium.svg
index 472c2d2a45f..8ccdafca7c7 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_organic_2.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_medium.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_organic_1.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_soft.svg
similarity index 96%
rename from addons/web_editor/static/image_shapes/basic/bsc_organic_1.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_soft.svg
index 2d6e77b4492..cb21787a394 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_organic_1.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_blob_soft.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_bread.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_bread.svg
new file mode 100644
index 00000000000..e60012a4f22
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_bread.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.3065,0C0.3435,0,0.379,0.0066,0.4118,0.0186C0.4676,0.039,0.5324,0.039,0.5882,0.0186C0.621,0.0066,0.6565,0,0.6935,0C0.8628,0,1,0.1372,1,0.3065C1,0.3435,0.9934,0.379,0.9814,0.4118C0.961,0.4676,0.961,0.5324,0.9814,0.5882C0.9934,0.621,1,0.6565,1,0.6935C1,0.8628,0.8628,1,0.6935,1C0.6565,1,0.621,0.9934,0.5882,0.9814C0.5324,0.961,0.4676,0.961,0.4118,0.9814C0.379,0.9934,0.3435,1,0.3065,1C0.1372,1,0,0.8628,0,0.6935C0,0.6565,0.0066,0.621,0.0186,0.5882C0.039,0.5324,0.039,0.4676,0.0186,0.4118C0.0066,0.379,0,0.3435,0,0.3065C0,0.1372,0.1372,0,0.3065,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/mass_mailing/static/image_shapes/basic/circle.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_circle.svg
similarity index 91%
rename from addons/mass_mailing/static/image_shapes/basic/circle.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_circle.svg
index 30fb07e6995..982f25b53bf 100644
--- a/addons/mass_mailing/static/image_shapes/basic/circle.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_circle.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
 	<defs>
 		<clipPath id="clip-path" clipPathUnits="objectBoundingBox">
 			<use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_clover.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_clover.svg
new file mode 100644
index 00000000000..f0b18d08de0
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_clover.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.9312,0.5C0.9742,0.4472,1,0.3799,1,0.3065C1,0.1372,0.8628,0,0.6935,0C0.6201,0,0.5528,0.0258,0.5,0.0688C0.4472,0.0258,0.3799,0,0.3065,0C0.1372,0,0,0.1372,0,0.3065C0,0.3799,0.0258,0.4472,0.0688,0.5C0.0258,0.5528,0,0.6201,0,0.6935C0,0.8628,0.1372,1,0.3065,1C0.3799,1,0.4472,0.9742,0.5,0.9312C0.5528,0.9742,0.6201,1,0.6935,1C0.8628,1,1,0.8628,1,0.6935C1,0.6201,0.9742,0.5528,0.9312,0.5Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_cornered.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_cornered.svg
new file mode 100644
index 00000000000..6597500986c
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_cornered.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.125C0,0.056,0.056,0,0.125,0H0.5C0.7761,0,1,0.2239,1,0.5V0.875C1,0.944,0.944,1,0.875,1H0.125C0.056,1,0,0.944,0,0.875V0.125ZZ">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_diamond.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_diamond.svg
new file mode 100644
index 00000000000..614018c9277
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_diamond.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.578,0.078A0.11,0.11,-90,0,0,0.422,0.078L0.078,0.422A0.11,0.11,-90,0,0,0.078,0.578L0.422,0.922A0.11,0.11,270,0,0,0.578,0.922L0.922,0.578A0.11,0.11,-90,0,0,0.922,0.422Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_door.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_door.svg
new file mode 100644
index 00000000000..ba235a5fb84
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_door.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5C0,0.2239,0.2239,0,0.5,0C0.7761,0,1,0.2239,1,0.5V0.875C1,0.944,0.944,1,0.875,1H0.125C0.056,1,0,0.944,0,0.875V0.5Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_emerald.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_emerald.svg
new file mode 100644
index 00000000000..4fd59f70e26
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_emerald.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.125C0,0.056,0.056,0,0.125,0L0.5625,0C0.6018,0,0.6389,0.0185,0.6625,0.05L0.975,0.4667C0.9912,0.4883,1,0.5146,1,0.5417V0.875C1,0.944,0.944,1,0.875,1H0.4375C0.3982,1,0.3611,0.9815,0.3375,0.95L0.025,0.5333C0.0088,0.5117,0,0.4854,0,0.4583V0.125Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_gem.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_gem.svg
new file mode 100644
index 00000000000..49782b3c036
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_gem.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.125C0,0.056,0.056,0,0.125,0H0.4482C0.4814,0,0.5132,0.0132,0.5366,0.0366L0.9634,0.4634C0.9868,0.4868,1,0.5186,1,0.5518V0.875C1,0.944,0.944,1,0.875,1H0.125C0.056,1,0,0.944,0,0.875V0.125Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_heptagon.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_heptagon.svg
new file mode 100644
index 00000000000..ccfd2a4502b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_heptagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4432,0.0132C0.4791-0.0044,0.5209-0.0044,0.5568,0.0132L0.8528,0.1584C0.8887,0.176,0.9148,0.2094,0.9236,0.249L0.9967,0.5752C1.0056,0.6148,0.9963,0.6564,0.9714,0.6881L0.7666,0.9498C0.7418,0.9815,0.7041,1,0.6642,1H0.3358C0.2959,1,0.2582,0.9815,0.2334,0.9498L0.0286,0.6881C0.0037,0.6564-0.0056,0.6148,0.0033,0.5752L0.0764,0.249C0.0852,0.2094,0.1113,0.176,0.1472,0.1584L0.4432,0.0132Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_hexagon.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_hexagon.svg
new file mode 100644
index 00000000000..2de75a6af1f
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_hexagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.426,0.0179C0.4718-0.006,0.5282-0.006,0.574,0.0179L0.926,0.2011C0.9718,0.225,1,0.2691,1,0.3167V0.6833C1,0.7309,0.9718,0.775,0.926,0.7989L0.574,0.9821C0.5282,1.006,0.4718,1.006,0.426,0.9821L0.074,0.7989C0.0282,0.775,0,0.7309,0,0.6833V0.3167C0,0.2691,0.0282,0.225,0.074,0.2011L0.426,0.0179Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_lemon.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_lemon.svg
new file mode 100644
index 00000000000..b060a7f8fee
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_lemon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5155C0,0.2308,0.2308,0,0.5155,0H0.875C0.944,0,1,0.056,1,0.125V0.4845C1,0.7692,0.7692,1,0.4845,1H0.125C0.056,1,0,0.944,0,0.875V0.5155Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_pentagon.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_pentagon.svg
new file mode 100644
index 00000000000..dd44b60ff34
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_pentagon.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4168,0.028C0.4664-0.0093,0.5336-0.0093,0.5832,0.028L0.9417,0.2979C0.9913,0.3353,1.012,0.4015,0.9931,0.4619L0.8561,0.8987C0.8372,0.9591,0.7829,1,0.7216,1H0.2784C0.2171,1,0.1628,0.9591,0.1439,0.8987L0.0069,0.4619C-0.012,0.4015,0.0087,0.3353,0.0583,0.2979L0.4168,0.028Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_pill.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_pill.svg
new file mode 100644
index 00000000000..3493f34e159
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_pill.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M 0.5 0 A 0.25 0.25 90 0 0 0.25 0.25 L 0.25 0.75 A 0.25 0.25 90 0 0 0.5 1 L 0.5 1 A 0.25 0.25 90 0 0 0.75 0.75 L 0.75 0.25 A 0.25 0.25 90 0 0 0.5 0 Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_shuriken.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_shuriken.svg
new file mode 100644
index 00000000000..d45a1e4850b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_shuriken.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.0004,0.1381C-0.0059,0.0596,0.0596-0.0059,0.1381,0.0004L0.4898,0.0286C0.4966,0.0291,0.5034,0.0291,0.5102,0.0286L0.8619,0.0004C0.9404-0.0059,1.0059,0.0596,0.9996,0.1381L0.9714,0.4898C0.9709,0.4966,0.9709,0.5034,0.9714,0.5102L0.9996,0.8619C1.0059,0.9404,0.9404,1.0059,0.8619,0.9996L0.5102,0.9714C0.5034,0.9709,0.4966,0.9709,0.4898,0.9714L0.1381,0.9996C0.0596,1.0059-0.0059,0.9404,0.0004,0.8619L0.0286,0.5102C0.0291,0.5034,0.0291,0.4966,0.0286,0.4898L0.0004,0.1381Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_sonar.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_sonar.svg
new file mode 100644
index 00000000000..1ec550e7efe
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_sonar.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.9991,0.8744C0.9424,0.4186,0.581,0.0573,0.1251,0.0008C0.0564-0.0077,0,0.0495,0,0.119L0,0.8741C0,0.9437,0.0561,1,0.1253,1L0.8816,1C0.9508,1,1.0077,0.9434,0.9991,0.8744Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_square.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square.svg
new file mode 100644
index 00000000000..8729549559c
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.11,0A0.11,0.11,-90,0,0,0,0.11L0,0.89A0.11,0.11,-90,0,0,0.11,1L0.89,1A0.11,0.11,270,0,0,1,0.89L1,0.11A0.11,0.11,-90,0,0,0.89,0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_rounded_1.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_rounded_1.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_square_1.svg
index 15b178df8c0..8d403d49feb 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_rounded_1.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/basic/bsc_square_rounded_2.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square_2.svg
similarity index 97%
rename from addons/web_editor/static/image_shapes/basic/bsc_square_rounded_2.svg
rename to addons/web_editor/static/image_shapes/geometric_round/geo_round_square_2.svg
index 6b38d2daed3..ca478edd576 100644
--- a/addons/web_editor/static/image_shapes/basic/bsc_square_rounded_2.svg
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_square_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_star.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star.svg
new file mode 100644
index 00000000000..d6b50f504de
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4671,0.0148C0.485-0.0049,0.515-0.0049,0.5329,0.0148L0.718,0.219C0.7218,0.2232,0.7264,0.2267,0.7314,0.2292L0.9742,0.3503C0.9976,0.362,1.0069,0.3919,0.9945,0.4158L0.8661,0.6632C0.8635,0.6683,0.8617,0.6739,0.861,0.6796L0.8259,0.9587C0.8226,0.9857,0.7983,1.0042,0.7727,0.9992L0.5083,0.9479C0.5028,0.9468,0.4972,0.9468,0.4917,0.9479L0.2273,0.9992C0.2017,1.0042,0.1775,0.9857,0.1741,0.9587L0.139,0.6796C0.1383,0.6739,0.1365,0.6683,0.1339,0.6632L0.0055,0.4158C-0.0069,0.3919,0.0024,0.362,0.0258,0.3503L0.2686,0.2292C0.2736,0.2267,0.2782,0.2232,0.282,0.219L0.4671,0.0148Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_16pin.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_16pin.svg
new file mode 100644
index 00000000000..5a3812d6827
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_16pin.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4513,0.0317C0.47-0.0106,0.53-0.0106,0.5487,0.0317C0.5637,0.0654,0.6075,0.0741,0.6342,0.0487C0.6677,0.0168,0.7231,0.0398,0.7242,0.086C0.7252,0.1228,0.7623,0.1477,0.7967,0.1344C0.8398,0.1178,0.8822,0.1602,0.8656,0.2033C0.8523,0.2377,0.8772,0.2748,0.914,0.2758C0.9602,0.2769,0.9832,0.3323,0.9513,0.3658C0.9259,0.3925,0.9346,0.4363,0.9683,0.4513C1.0106,0.47,1.0106,0.53,0.9683,0.5487C0.9346,0.5637,0.9259,0.6075,0.9513,0.6342C0.9832,0.6677,0.9602,0.7231,0.914,0.7242C0.8772,0.7252,0.8523,0.7623,0.8656,0.7967C0.8822,0.8398,0.8398,0.8822,0.7967,0.8656C0.7623,0.8523,0.7252,0.8772,0.7242,0.914C0.7231,0.9602,0.6677,0.9832,0.6342,0.9513C0.6075,0.9259,0.5637,0.9346,0.5487,0.9683C0.53,1.0106,0.47,1.0106,0.4513,0.9683C0.4363,0.9346,0.3925,0.9259,0.3658,0.9513C0.3323,0.9832,0.2769,0.9602,0.2758,0.914C0.2748,0.8772,0.2377,0.8523,0.2033,0.8656C0.1602,0.8822,0.1178,0.8398,0.1344,0.7967C0.1477,0.7623,0.1228,0.7252,0.086,0.7242C0.0398,0.7231,0.0168,0.6677,0.0487,0.6342C0.0741,0.6075,0.0654,0.5637,0.0317,0.5487C-0.0106,0.53-0.0106,0.47,0.0317,0.4513C0.0654,0.4363,0.0741,0.3925,0.0487,0.3658C0.0168,0.3323,0.0398,0.2769,0.086,0.2758C0.1228,0.2748,0.1477,0.2377,0.1344,0.2033C0.1178,0.1602,0.1602,0.1178,0.2033,0.1344C0.2377,0.1477,0.2748,0.1228,0.2758,0.086C0.2769,0.0398,0.3323,0.0168,0.3658,0.0487C0.3925,0.0741,0.4363,0.0654,0.4513,0.0317Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_7pin.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_7pin.svg
new file mode 100644
index 00000000000..fac44f09504
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_7pin.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4053,0.051C0.4508-0.017,0.5492-0.017,0.5947,0.051L0.6318,0.1063C0.6549,0.1407,0.6942,0.16,0.735,0.157L0.8005,0.152C0.881,0.1459,0.9423,0.2244,0.9186,0.3031L0.8993,0.3671C0.8873,0.4069,0.897,0.4503,0.9248,0.4809L0.9694,0.5301C1.0243,0.5905,1.0024,0.6883,0.9273,0.7184L0.8661,0.7429C0.8281,0.7582,0.8009,0.793,0.7947,0.8342L0.7849,0.9005C0.7728,0.9819,0.6842,1.0254,0.6142,0.9843L0.5573,0.9508C0.5218,0.93,0.4782,0.93,0.4427,0.9508L0.3858,0.9843C0.3158,1.0254,0.2272,0.9819,0.2151,0.9005L0.2053,0.8342C0.1991,0.793,0.1719,0.7582,0.1339,0.7429L0.0727,0.7184C-0.0024,0.6883-0.0243,0.5905,0.0306,0.5301L0.0752,0.4809C0.103,0.4503,0.1127,0.4069,0.1007,0.3671L0.0814,0.3031C0.0577,0.2244,0.119,0.1459,0.1995,0.152L0.265,0.157C0.3058,0.16,0.3451,0.1407,0.3682,0.1063L0.4053,0.051Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_8pin.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_8pin.svg
new file mode 100644
index 00000000000..54980041b1e
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_star_8pin.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4135,0.0425C0.4572-0.0142,0.5428-0.0142,0.5865,0.0425L0.6152,0.0798C0.6389,0.1105,0.6772,0.1264,0.7157,0.1214L0.7623,0.1154C0.8333,0.1062,0.8938,0.1667,0.8846,0.2377L0.8786,0.2843C0.8736,0.3228,0.8895,0.3611,0.9202,0.3848L0.9575,0.4135C1.0142,0.4572,1.0142,0.5428,0.9575,0.5865L0.9202,0.6152C0.8895,0.6389,0.8736,0.6772,0.8786,0.7157L0.8846,0.7623C0.8938,0.8333,0.8333,0.8938,0.7623,0.8846L0.7157,0.8786C0.6772,0.8736,0.6389,0.8895,0.6152,0.9202L0.5865,0.9575C0.5428,1.0142,0.4572,1.0142,0.4135,0.9575L0.3848,0.9202C0.3611,0.8895,0.3228,0.8736,0.2843,0.8786L0.2377,0.8846C0.1667,0.8938,0.1062,0.8333,0.1154,0.7623L0.1214,0.7157C0.1264,0.6772,0.1105,0.6389,0.0798,0.6152L0.0425,0.5865C-0.0142,0.5428-0.0142,0.4572,0.0425,0.4135L0.0798,0.3848C0.1105,0.3611,0.1264,0.3228,0.1214,0.2843L0.1154,0.2377C0.1062,0.1667,0.1667,0.1062,0.2377,0.1154L0.2843,0.1214C0.3228,0.1264,0.3611,0.1105,0.3848,0.0798L0.4135,0.0425Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_tear.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_tear.svg
new file mode 100644
index 00000000000..660eb050822
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_tear.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.5C0,0.2239,0.2239,0,0.5,0H0.8735C0.9434,0,1,0.0566,1,0.1265V0.5C1,0.7761,0.7761,1,0.5,1C0.2239,1,0,0.7761,0,0.5Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/geometric_round/geo_round_triangle.svg b/addons/web_editor/static/image_shapes/geometric_round/geo_round_triangle.svg
new file mode 100644
index 00000000000..73b2444b2f6
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/geometric_round/geo_round_triangle.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.3676,0.0844C0.4265-0.0281,0.5735-0.0281,0.6324,0.0844L0.9791,0.7458C1.0383,0.8586,0.9646,1,0.8467,1H0.1533C0.0354,1-0.0383,0.8586,0.0209,0.7458L0.3676,0.0844Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_duo.svg b/addons/web_editor/static/image_shapes/panel/panel_duo.svg
new file mode 100644
index 00000000000..f886ef96968
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_duo.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M1,0H0.5189V1H1V0ZM0.4811,0H0V1H0.4811V0Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_duo_r.svg b/addons/web_editor/static/image_shapes/panel/panel_duo_r.svg
new file mode 100644
index 00000000000..5deefb1cb7e
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_duo_r.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.0427C0,0.0191,0.0191,0,0.0427,0H0.4384C0.462,0,0.4811,0.0191,0.4811,0.0427V0.9573C0.4811,0.9809,0.462,1,0.4384,1H0.0427C0.0191,1,0,0.9809,0,0.9573V0.0427ZM0.5189,0.0427C0.5189,0.0191,0.538,0,0.5616,0H0.9573C0.9809,0,1,0.0191,1,0.0427V0.9573C1,0.9809,0.9809,1,0.9573,1H0.5616C0.538,1,0.5189,0.9809,0.5189,0.9573V0.0427Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_duo_step.svg b/addons/web_editor/static/image_shapes/panel/panel_duo_step.svg
new file mode 100644
index 00000000000..2ade003895f
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_duo_step.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.0427C0,0.0191,0.0191,0,0.0427,0H0.4384C0.462,0,0.4811,0.0191,0.4811,0.0427V0.8616C0.4811,0.8852,0.462,0.9043,0.4384,0.9043H0.0427C0.0191,0.9043,0,0.8852,0,0.8616V0.0427ZM0.5189,0.1384C0.5189,0.1148,0.538,0.0957,0.5616,0.0957H0.9573C0.9809,0.0957,1,0.1148,1,0.1384V0.9573C1,0.9809,0.9809,1,0.9573,1H0.5616C0.538,1,0.5189,0.9809,0.5189,0.9573V0.1384Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_duo_step_pill.svg b/addons/web_editor/static/image_shapes/panel/panel_duo_step_pill.svg
new file mode 100644
index 00000000000..5f1befdaf3b
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_duo_step_pill.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0,0.2402C0,0.1075,0.1077,0,0.2406,0C0.3734,0,0.4811,0.1075,0.4811,0.2402V0.6641C0.4811,0.7968,0.3734,0.9043,0.2406,0.9043C0.1077,0.9043,0,0.7968,0,0.6641V0.2402ZM0.5189,0.3359C0.5189,0.2032,0.6266,0.0957,0.7594,0.0957C0.8923,0.0957,1,0.2032,1,0.3359V0.7598C1,0.8925,0.8923,1,0.7594,1C0.6266,1,0.5189,0.8925,0.5189,0.7598V0.3359Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_trio_in_r.svg b/addons/web_editor/static/image_shapes/panel/panel_trio_in_r.svg
new file mode 100644
index 00000000000..ac22ff3434c
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_trio_in_r.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.3886,0C0.365,0,0.3458,0.0191,0.3458,0.0427V0.9573C0.3458,0.9809,0.365,1,0.3886,1H0.6114C0.635,1,0.6542,0.9809,0.6542,0.9573V0.0427C0.6542,0.0191,0.635,0,0.6114,0H0.3886ZM0,0.079C0,0.0576,0.0158,0.0395,0.037,0.0367L0.2599,0.0065C0.2855,0.0031,0.3083,0.023,0.3083,0.0489V0.9511C0.3083,0.977,0.2855,0.9969,0.2599,0.9935L0.037,0.9633C0.0158,0.9605,0,0.9424,0,0.921V0.079ZM1,0.9253C1,0.9467,0.9842,0.9648,0.9631,0.9677L0.7444,0.9976C0.7187,1.0011,0.6958,0.9812,0.6958,0.9553L0.6958,0.0533C0.6958,0.0274,0.7187,0.0074,0.7444,0.0109L0.9631,0.0409C0.9842,0.0438,1,0.0619,1,0.0832L1,0.9253Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_trio_out_r.svg b/addons/web_editor/static/image_shapes/panel/panel_trio_out_r.svg
new file mode 100644
index 00000000000..0b0adb608e2
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_trio_out_r.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.6915,0.0736C0.6915,0.0521,0.7072,0.0338,0.7283,0.0309L0.9518,0.0004C0.9773-0.0031,1,0.017,1,0.0431L1,0.9569C1,0.983,0.9773,1.0031,0.9518,0.9996L0.7283,0.9691C0.7072,0.9662,0.6915,0.9479,0.6915,0.9264L0.6915,0.0736ZM0.3085,0.9264C0.3085,0.9479,0.2928,0.9662,0.2717,0.9691L0.0482,0.9996C0.0227,1.0031,0,0.983,0,0.9569L0,0.0431C0,0.017,0.0227-0.0031,0.0482,0.0004L0.2717,0.0309C0.2928,0.0338,0.3085,0.0521,0.3085,0.0736L0.3085,0.9264ZM0.3936,0.0476C0.3701,0.0476,0.3511,0.0669,0.3511,0.0907V0.92C0.3511,0.9438,0.3701,0.9631,0.3936,0.9631H0.6064C0.6299,0.9631,0.6489,0.9438,0.6489,0.92V0.0907C0.6489,0.0669,0.6299,0.0476,0.6064,0.0476H0.3936Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/panel/panel_window.svg b/addons/web_editor/static/image_shapes/panel/panel_window.svg
new file mode 100644
index 00000000000..d762c5cb935
--- /dev/null
+++ b/addons/web_editor/static/image_shapes/panel/panel_window.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
+    <defs>
+        <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
+            <use xlink:href="#filterPath" fill="none"/>
+        </clipPath>
+        <path id="filterPath" d="M0.4811,0.3964C0.4811,0.4462,0.4389,0.4865,0.3868,0.4865H0.0943C0.0422,0.4865,0,0.4462,0,0.3964L0,0L0.3868,0C0.4389,0,0.4811,0.0403,0.4811,0.0901V0.3964ZM1,0.3964C1,0.4462,0.9578,0.4865,0.9057,0.4865H0.6132C0.5611,0.4865,0.5189,0.4462,0.5189,0.3964L0.5189,0.0901C0.5189,0.0403,0.5611,0,0.6132,0L1,0L1,0.3964ZM0.4811,0.9099C0.4811,0.9597,0.4389,1,0.3868,1L0,1L0,0.6036C0,0.5538,0.0422,0.5135,0.0943,0.5135L0.3868,0.5135C0.4389,0.5135,0.4811,0.5538,0.4811,0.6036V0.9099ZM1,1L0.6132,1C0.5611,1,0.5189,0.9597,0.5189,0.9099L0.5189,0.6036C0.5189,0.5538,0.5611,0.5135,0.6132,0.5135L0.9057,0.5135C0.9578,0.5135,1,0.5538,1,0.6036V1Z">
+        </path>
+    </defs>
+    <svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
+        <use xlink:href="#filterPath" fill="darkgrey"/>
+    </svg>
+    <image xlink:href="" clip-path="url(#clip-path)"/>
+</svg>
diff --git a/addons/web_editor/static/image_shapes/special/spl_circuit_1.svg b/addons/web_editor/static/image_shapes/pattern/pattern_circuit.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/special/spl_circuit_1.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_circuit.svg
index 6d496261e44..4055114ac79 100644
--- a/addons/web_editor/static/image_shapes/special/spl_circuit_1.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_circuit.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_labyrinth.svg b/addons/web_editor/static/image_shapes/pattern/pattern_labyrinth.svg
index 8c4b18f1012..552b69cddb7 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_labyrinth.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_labyrinth.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="600" height="600">
     <defs>
         <pattern id="pattern" width="1634.68" height="1461.26" patternUnits="userSpaceOnUse" viewBox="0 0 1634.68 1461.26" patternTransform="scale(0.05)">
             <rect width="1634.68" height="1461.26" fill="#FFFFFF"/>
diff --git a/addons/web_editor/static/image_shapes/line/line_star.svg b/addons/web_editor/static/image_shapes/pattern/pattern_line_star.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/line/line_star.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_line_star.svg
index 601779591d6..6da52735a92 100644
--- a/addons/web_editor/static/image_shapes/line/line_star.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_line_star.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <style>
         @keyframes rotate {
             from {transform: rotate(0deg);}
diff --git a/addons/web_editor/static/image_shapes/line/line_sun.svg b/addons/web_editor/static/image_shapes/pattern/pattern_line_sun.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/line/line_sun.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_line_sun.svg
index fbe18764a85..1e0a0ec9329 100644
--- a/addons/web_editor/static/image_shapes/line/line_sun.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_line_sun.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="600" height="600">
     <style>
         @keyframes rotate {
             from {transform: rotate(0deg);}
diff --git a/addons/web_editor/static/image_shapes/pattern/organic_4_pattern_caps.svg b/addons/web_editor/static/image_shapes/pattern/pattern_organic_caps.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/organic_4_pattern_caps.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_organic_caps.svg
index 9bba1304091..7f58e60f1d9 100644
--- a/addons/web_editor/static/image_shapes/pattern/organic_4_pattern_caps.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_organic_caps.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <pattern id="Capsules_2" data-name="Capsules 2" width="57.6" stroke="#3AADAA" height="57.6"
       patternTransform="translate(-59.36 422.92) scale(1.09 1.17)" patternUnits="userSpaceOnUse"
diff --git a/addons/web_editor/static/image_shapes/pattern/organic_3_pattern_cross.svg b/addons/web_editor/static/image_shapes/pattern/pattern_organic_cross.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/organic_3_pattern_cross.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_organic_cross.svg
index 34c84c42cc7..08ccae653d8 100644
--- a/addons/web_editor/static/image_shapes/pattern/organic_3_pattern_cross.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_organic_cross.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <pattern id="Crosses_5" data-name="Crosses 5" stroke="#7C6576" width="57.6" height="57.6"
       patternTransform="translate(0 691.2)" patternUnits="userSpaceOnUse" viewBox="0 0 57.6 57.6">
diff --git a/addons/web_editor/static/image_shapes/pattern/organic_2_pattern_dot.svg b/addons/web_editor/static/image_shapes/pattern/pattern_organic_dot.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/organic_2_pattern_dot.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_organic_dot.svg
index b47013db8d7..173b6d69971 100644
--- a/addons/web_editor/static/image_shapes/pattern/organic_2_pattern_dot.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_organic_dot.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
       <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
         <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/line/oval_3_pattern_line.svg b/addons/web_editor/static/image_shapes/pattern/pattern_oval_zebra.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/line/oval_3_pattern_line.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_oval_zebra.svg
index bbd572b6076..1812155e112 100644
--- a/addons/web_editor/static/image_shapes/line/oval_3_pattern_line.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_oval_zebra.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <pattern id="_10_lpi_80_2" data-name="10 lpi 80% 2" width="72" height="72" stroke="#3AADAA"
       patternTransform="translate(0 432)" patternUnits="userSpaceOnUse" viewBox="0 0 72 72">
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_points_1.svg b/addons/web_editor/static/image_shapes/pattern/pattern_point.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/pattern_points_1.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_point.svg
index 8d2fe37444a..8df314ad8df 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_points_1.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_point.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <pattern id="pattern" width="4" height="4" viewBox="0 -4 4 4" patternUnits="userSpaceOnUse">
             <circle cx="1" cy="-1" r="0.5" fill="#3AADAA"/>
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_waves_1.svg b/addons/web_editor/static/image_shapes/pattern/pattern_wave_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/pattern/pattern_waves_1.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_wave_1.svg
index babae1e93b3..a778e7e3b4f 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_waves_1.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_wave_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <pattern id="pattern" width="6.24" height="6.24" viewBox="0 0 6.24 6.24" patternUnits="userSpaceOnUse">
             <rect width="100%" height="100%" fill="#3AADAA"/>
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_waves_2.svg b/addons/web_editor/static/image_shapes/pattern/pattern_wave_2.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/pattern_waves_2.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_wave_2.svg
index 2c1b6c5ca73..7100dcdf66d 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_waves_2.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_wave_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <pattern id="pattern" width="250" height="30" patternUnits="userSpaceOnUse" patternTransform="rotate(41) scale(0.3)">
             <rect fill="#FFFFFF" width="250" height="30"/>
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_waves_4.svg b/addons/web_editor/static/image_shapes/pattern/pattern_wave_3.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/pattern_waves_4.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_wave_3.svg
index c4752773973..ca53d9caf90 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_waves_4.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_wave_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/pattern/pattern_waves_3.svg b/addons/web_editor/static/image_shapes/pattern/pattern_wave_4.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/pattern/pattern_waves_3.svg
rename to addons/web_editor/static/image_shapes/pattern/pattern_wave_4.svg
index a5fca9f1b8a..a5315a55466 100644
--- a/addons/web_editor/static/image_shapes/pattern/pattern_waves_3.svg
+++ b/addons/web_editor/static/image_shapes/pattern/pattern_wave_4.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/blob_1_solid_rd.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_1.svg
similarity index 97%
rename from addons/web_editor/static/image_shapes/solid/blob_1_solid_rd.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_1.svg
index 170d6dc4240..655a1a01798 100644
--- a/addons/web_editor/static/image_shapes/solid/blob_1_solid_rd.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/solid/blob_2_solid_str.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_2.svg
similarity index 96%
rename from addons/web_editor/static/image_shapes/solid/blob_2_solid_str.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_2.svg
index dc5fd1008d0..11e7d47ca08 100644
--- a/addons/web_editor/static/image_shapes/solid/blob_2_solid_str.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
       <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/solid/blob_3_solid_rd.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_3.svg
similarity index 96%
rename from addons/web_editor/static/image_shapes/solid/blob_3_solid_rd.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_3.svg
index c6bc3eec0cb..d13adc91cf3 100644
--- a/addons/web_editor/static/image_shapes/solid/blob_3_solid_rd.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_3.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/solid/oval_1_solid_rd.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_4.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/solid/oval_1_solid_rd.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_4.svg
index 6bdbacb5ce2..f53201de4a2 100644
--- a/addons/web_editor/static/image_shapes/solid/oval_1_solid_rd.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_4.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
   <defs>
     <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
       <use xlink:href="#filterPath" fill="none"></use>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_blob_4.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_5.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/solid/sld_blob_4.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_5.svg
index c7b3fb9717a..d2308b117c4 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_blob_4.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_5.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_blob_shadow_1.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_shadow_1.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/solid/sld_blob_shadow_1.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_shadow_1.svg
index 162c24d0c78..1aff2a60d3c 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_blob_shadow_1.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_shadow_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_blob_shadow_2.svg b/addons/web_editor/static/image_shapes/solid/solid_blob_shadow_2.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/solid/sld_blob_shadow_2.svg
rename to addons/web_editor/static/image_shapes/solid/solid_blob_shadow_2.svg
index 7bcd52ced84..72fd1748275 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_blob_shadow_2.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_blob_shadow_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_square_1.svg b/addons/web_editor/static/image_shapes/solid/solid_square_1.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/solid/sld_square_1.svg
rename to addons/web_editor/static/image_shapes/solid/solid_square_1.svg
index 2caa6b3a00b..8f65c2cd045 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_square_1.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_square_1.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600" id="shape">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600" id="shape">
   <defs>
       <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
           <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_square_2.svg b/addons/web_editor/static/image_shapes/solid/solid_square_2.svg
similarity index 95%
rename from addons/web_editor/static/image_shapes/solid/sld_square_2.svg
rename to addons/web_editor/static/image_shapes/solid/solid_square_2.svg
index 6fdb10a3f87..0ea646571d7 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_square_2.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_square_2.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="60" id="shape">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600" id="shape">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/solid/sld_square_organic_1.svg b/addons/web_editor/static/image_shapes/solid/solid_square_3.svg
similarity index 97%
rename from addons/web_editor/static/image_shapes/solid/sld_square_organic_1.svg
rename to addons/web_editor/static/image_shapes/solid/solid_square_3.svg
index 4b92cd83955..7fcf7b6b042 100644
--- a/addons/web_editor/static/image_shapes/solid/sld_square_organic_1.svg
+++ b/addons/web_editor/static/image_shapes/solid/solid_square_3.svg
@@ -1,11 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="60" id="shape">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600" id="shape">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
         </clipPath>
         <path id="filterPath" d="M.14.1882.99.1l-.0421.8L.188.8574.14.1882z"/>
         <g id="animation">
-            <animateTransform xlink:href="#shape" attributeName="transform" attributeType="XML" type="translate" dur="6s" values="0 0;0 8;0 0" repeatCount="indefinite" calcMode="spline" keySplines=".45 .05 .55 .95;.45 .05 .55 .95"/>    
+            <animateTransform xlink:href="#shape" attributeName="transform" attributeType="XML" type="translate" dur="6s" values="0 0;0 8;0 0" repeatCount="indefinite" calcMode="spline" keySplines=".45 .05 .55 .95;.45 .05 .55 .95"/>
         </g>
     </defs>
     <svg preserveAspectRatio="none" viewBox="0 0 1600 1201" width="96%" height="96%" x="2%" y="2%">
diff --git a/addons/web_editor/static/image_shapes/special/spl_filter_1.svg b/addons/web_editor/static/image_shapes/special/special_filter.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/special/spl_filter_1.svg
rename to addons/web_editor/static/image_shapes/special/special_filter.svg
index cc2a278e624..3d68e9c9e58 100644
--- a/addons/web_editor/static/image_shapes/special/spl_filter_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_filter.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/special/spl_flag_1.svg b/addons/web_editor/static/image_shapes/special/special_flag.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/special/spl_flag_1.svg
rename to addons/web_editor/static/image_shapes/special/special_flag.svg
index a68177553ad..a92174276f3 100644
--- a/addons/web_editor/static/image_shapes/special/spl_flag_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_flag.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/float/flt_primary_3.svg b/addons/web_editor/static/image_shapes/special/special_layered.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/float/flt_primary_3.svg
rename to addons/web_editor/static/image_shapes/special/special_layered.svg
index 2321c7319b8..91e59ba35c3 100644
--- a/addons/web_editor/static/image_shapes/float/flt_primary_3.svg
+++ b/addons/web_editor/static/image_shapes/special/special_layered.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/special/spl_organics_1.svg b/addons/web_editor/static/image_shapes/special/special_organic.svg
similarity index 98%
rename from addons/web_editor/static/image_shapes/special/spl_organics_1.svg
rename to addons/web_editor/static/image_shapes/special/special_organic.svg
index d75bfbca0fc..43950f3d943 100644
--- a/addons/web_editor/static/image_shapes/special/spl_organics_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_organic.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/special/spl_rain_1.svg b/addons/web_editor/static/image_shapes/special/special_rain.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/special/spl_rain_1.svg
rename to addons/web_editor/static/image_shapes/special/special_rain.svg
index 69037ebdb9b..e75ece9ea00 100644
--- a/addons/web_editor/static/image_shapes/special/spl_rain_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_rain.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/special/spl_snow_1.svg b/addons/web_editor/static/image_shapes/special/special_snow.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/special/spl_snow_1.svg
rename to addons/web_editor/static/image_shapes/special/special_snow.svg
index f492449992b..0b477dd27a7 100644
--- a/addons/web_editor/static/image_shapes/special/spl_snow_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_snow.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <defs>
         <clipPath id="clip-path" clipPathUnits="objectBoundingBox">
             <use xlink:href="#filterPath" fill="none"/>
diff --git a/addons/web_editor/static/image_shapes/special/spl_speed_1.svg b/addons/web_editor/static/image_shapes/special/special_speed.svg
similarity index 99%
rename from addons/web_editor/static/image_shapes/special/spl_speed_1.svg
rename to addons/web_editor/static/image_shapes/special/special_speed.svg
index f7ca285903d..fb6c22a385a 100644
--- a/addons/web_editor/static/image_shapes/special/spl_speed_1.svg
+++ b/addons/web_editor/static/image_shapes/special/special_speed.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="600">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600">
     <style type="text/css">
         @keyframes ld-speed-dash {
             0% { transform: translate(0,0); }
diff --git a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
index e15dec855ca..45f41f0c7c3 100644
--- a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
@@ -1089,13 +1089,13 @@
 
                 we-button img {
                     height: $o-we-sidebar-content-field-dropdown-grid-item-height;
-                    width: $o-we-sidebar-content-field-dropdown-grid-item-width;
+                    width: $o-we-sidebar-content-field-dropdown-grid-item-height;
                 }
                 &.active {
                     display: flex;
                     flex-wrap: wrap;
                     we-button {
-                        width: percentage(1 / 3);
+                        width: percentage(1 / 4);
                         padding: 0;
                         justify-content: center;
                         img {
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index e2324796c56..f393a02c6b6 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -460,78 +460,156 @@
         <div class="o_we_image_shape">
             <we-row string="Shape" class="o_we_full_row">
                 <we-select-pager data-name="shape_img_opt" class="o_we_select_grid o_we_fake_transparent_background">
-                    <!-- This page only contains animated shapes by default. If
-                    using xpath to add non-animated shapes, also use xpath to
-                    remove the t-if on the page. This is why individual options
-                    also have that t-if.  -->
-                    <we-select-page class="o_we_basic_shapes" string="Basics" t-if="not no_animations">
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_1" data-select-label="Square 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_2" data-select-label="Square 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_3" data-select-label="Square 3" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_4" data-select-label="Square 4" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_5" data-select-label="Square 5" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_6" data-select-label="Square 6" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_rounded_1" data-select-label="Square Rounded 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_square_rounded_2" data-select-label="Square Rounded 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_organic_1" data-select-label="Organic Soft" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_organic_2" data-select-label="Organic Medium" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/basic/bsc_organic_3" data-select-label="Organic Hard" data-animated="true"/>
+                    <we-select-page string="Geometrics">
+                        <we-button data-set-img-shape="web_editor/geometric/geo_square" data-select-label="Square"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_shuriken" data-select-label="Shuriken"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_diamond" data-select-label="Diamond"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_triangle" data-select-label="Triangle"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_cornered_triangle" data-select-label="Corner Triangle"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_pentagon" data-select-label="Pentagon"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_hexagon" data-select-label="Hexagon"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_heptagon" data-select-label="Heptagon"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_star" data-select-label="Star 1"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_star_8pin" data-select-label="Star 2"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_star_16pin" data-select-label="Star 3"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_slanted" data-select-label="Slanted"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_emerald" data-select-label="Emerald"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_tetris" data-select-label="Tetris"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_kayak" data-select-label="Kayak"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_tear" data-select-label="Tear"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_gem" data-select-label="Gem"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_sonar" data-select-label="Sonar"/>
+                        <we-button data-set-img-shape="web_editor/geometric/geo_door" data-select-label="Door"/>
+                        <t t-if="not no_animations">
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_1" data-select-label="Square 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_2" data-select-label="Square 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_3" data-select-label="Square 3" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_4" data-select-label="Square 4" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_5" data-select-label="Square 5" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric/geo_square_6" data-select-label="Square 6" data-animated="true"/>
+                        </t>
                     </we-select-page>
-                    <we-select-page string="Solids">
-                        <we-button data-set-img-shape="web_editor/solid/blob_1_solid_rd" data-select-label="Blob Solid 1" />
-                        <we-button data-set-img-shape="web_editor/solid/blob_2_solid_str" data-select-label="Blob Solid 2" />
-                        <we-button data-set-img-shape="web_editor/solid/blob_3_solid_rd" data-select-label="Blob Solid 3" />
-                        <we-button data-set-img-shape="web_editor/solid/oval_1_solid_rd" data-select-label="Oval Solid"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_blob_4" data-select-label="Blob Solid 4" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_blob_shadow_1" data-select-label="Blob Shadow 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_blob_shadow_2" data-select-label="Blob Shadow 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_square_1" data-select-label="Square 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_square_2" data-select-label="Square 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/solid/sld_square_organic_1" data-select-label="Square - Organic" data-animated="true"/>
+
+                    <we-select-page string="Geometrics Rounded">
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_circle" data-select-label="Circle"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_square" data-select-label="Square (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_diamond" data-select-label="Diamond (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_shuriken" data-select-label="Shuriken (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_triangle" data-select-label="Triangle (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_pentagon" data-select-label="Pentagon (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_hexagon" data-select-label="Hexagon (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_heptagon" data-select-label="Heptagon (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_star" data-select-label="Star 1 (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_star_7pin" data-select-label="Star 2 (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_star_8pin" data-select-label="Star 3 (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_star_16pin" data-select-label="Star 4 (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_emerald" data-select-label="Emerald (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_lemon" data-select-label="Lemon (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_tear" data-select-label="Tear (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_pill" data-select-label="Pill (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_gem" data-select-label="Gem (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_cornered" data-select-label="Cornered"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_door" data-select-label="Door (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_sonar" data-select-label="Sonar (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_clover" data-select-label="Clover (R)"/>
+                        <we-button data-set-img-shape="web_editor/geometric_round/geo_round_bread" data-select-label="Bread (R)"/>
+                        <t t-if="not no_animations">
+                            <we-button data-set-img-shape="web_editor/geometric_round/geo_round_square_1" data-select-label="Square 1 (R)" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric_round/geo_round_square_2" data-select-label="Square 2 (R)" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric_round/geo_round_blob_soft" data-select-label="Blob Soft" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric_round/geo_round_blob_medium" data-select-label="Blob Medium" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/geometric_round/geo_round_blob_hard" data-select-label="Blob Hard" data-animated="true"/>
+                        </t>
                     </we-select-page>
+
+                    <we-select-page string="Panels">
+                        <we-button data-set-img-shape="web_editor/panel/panel_duo" data-select-label="Duo"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_duo_r" data-select-label="Duo (R)"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_duo_step" data-select-label="Duo Step"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_duo_step_pill" data-select-label="Duo Step Pill"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_trio_in_r" data-select-label="Trio In (R)"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_trio_out_r" data-select-label="Trio Out (R)"/>
+                        <we-button data-set-img-shape="web_editor/panel/panel_window" data-select-label="Window"/>
+                    </we-select-page>
+
+                    <we-select-page string="Composites">
+                        <we-button data-set-img-shape="web_editor/composite/composite_double_pill" data-select-label="Double Pill"/>
+                        <we-button data-set-img-shape="web_editor/composite/composite_triple_pill" data-select-label="Triple Pill"/>
+                        <we-button data-set-img-shape="web_editor/composite/composite_half_circle" data-select-label="Half Circle"/>
+                        <we-button data-set-img-shape="web_editor/composite/composite_sonar" data-select-label="Double Sonar"/>
+                        <we-button data-set-img-shape="web_editor/composite/composite_cut_circle" data-select-label="Cut Circle"/>
+                    </we-select-page>
+
+                    <we-select-page string="Brushed">
+                        <we-button data-set-img-shape="web_editor/brushed/brush_1" data-select-label="Brush 1"/>
+                        <we-button data-set-img-shape="web_editor/brushed/brush_2" data-select-label="Brush 2"/>
+                        <we-button data-set-img-shape="web_editor/brushed/brush_3" data-select-label="Brush 3"/>
+                        <we-button data-set-img-shape="web_editor/brushed/brush_4" data-select-label="Brush 4"/>
+                    </we-select-page>
+
+                    <we-select-page string="Composition">
+                        <we-button data-set-img-shape="web_editor/composition/composition_organic_line" data-select-label="Organic Line"/>
+                        <we-button data-set-img-shape="web_editor/composition/composition_oval_line" data-select-label="Oval Line"/>
+                        <t t-if="not no_animations">
+                            <we-button data-set-img-shape="web_editor/composition/composition_triangle_line" data-select-label="Triangle Line" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_line_1" data-select-label="Line 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_line_3" data-select-label="Line 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_line_2" data-select-label="Line 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_mixed_1" data-select-label="Mixed 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_mixed_2" data-select-label="Mixed 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_planet_1" data-select-label="Planet 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_planet_2" data-select-label="Planet 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_square_1" data-select-label="Square Dot 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_square_2" data-select-label="Square Dot 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_square_3" data-select-label="Square Dot 3" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_square_4" data-select-label="Square Dot 4" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/composition/composition_square_line" data-select-label="Square Line" data-animated="true"/>
+                        </t>
+                    </we-select-page>
+
                     <we-select-page string="Patterns">
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/organic_2_pattern_dot" data-select-label="Organic Dot" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/pattern/organic_3_pattern_cross" data-select-label="Organic Cross" />
-                        <we-button data-set-img-shape="web_editor/pattern/organic_4_pattern_caps" data-select-label="Organic Caps" />
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_labyrinth" data-select-label="Labyrinth" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_points_1" data-select-label="Points" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_waves_1" data-select-label="Waves 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_waves_2" data-select-label="Waves 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_waves_3" data-select-label="Waves 3" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/pattern/pattern_waves_4" data-select-label="Waves 4" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/pattern/pattern_organic_cross" data-select-label="Organic Cross"/>
+                        <we-button data-set-img-shape="web_editor/pattern/pattern_organic_caps" data-select-label="Organic Caps"/>
+                        <we-button data-set-img-shape="web_editor/pattern/pattern_oval_zebra" data-select-label="Oval Zebra"/>
+                        <t t-if="not no_animations">
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_wave_1" data-select-label="Wave 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_line_star" data-select-label="Star" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_line_sun" data-select-label="Sun" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_wave_2" data-select-label="Wave 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_wave_3" data-select-label="Wave 3" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_point" data-select-label="Point" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_organic_dot" data-select-label="Organic Dot" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_labyrinth" data-select-label="Labyrinth" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_circuit" data-select-label="Circuit" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/pattern/pattern_wave_4" data-select-label="Wave 4" data-animated="true"/>
+                        </t>
                     </we-select-page>
-                    <we-select-page string="Lines">
-                        <we-button data-set-img-shape="web_editor/line/oval_3_pattern_line" data-select-label="Oval Line" />
-                        <we-button data-set-img-shape="web_editor/line/organic_1_line" data-select-label="Organic Line" />
-                        <we-button data-set-img-shape="web_editor/line/oval_2_line" data-select-label="Oval Line 2" />
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/little_lines_1" data-select-label="Little lines 1" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/little_lines_2" data-select-label="Little lines 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/little_lines_3" data-select-label="Little lines 2" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/line_square_1" data-select-label="Square" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/line_triangle" data-select-label="Triangles" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/line_star" data-select-label="Star" data-animated="true"/>
-                        <we-button t-if="not no_animations" data-set-img-shape="web_editor/line/line_sun" data-select-label="Sun" data-animated="true"/>
-                    </we-select-page>
-                    <we-select-page string="Floats" t-if="not no_animations">
-                        <we-button data-set-img-shape="web_editor/float/flt_primary_1" data-select-label="Primary shapes 1" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_primary_2" data-select-label="Primary shapes 2" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_primary_3" data-select-label="Primary shapes 3" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_planets_1" data-select-label="Planets 1" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_planets_2" data-select-label="Planets 2" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_square_1" data-select-label="Square 1" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_square_2" data-select-label="Square 2" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_square_3" data-select-label="Square 3" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/float/flt_square_4" data-select-label="Square 4" data-animated="true"/>
+
+                    <we-select-page string="Solids">
+                        <we-button data-set-img-shape="web_editor/solid/solid_blob_1" data-select-label="Blob 1"/>
+                        <we-button data-set-img-shape="web_editor/solid/solid_blob_2" data-select-label="Blob 2"/>
+                        <we-button data-set-img-shape="web_editor/solid/solid_blob_3" data-select-label="Blob 3"/>
+                        <we-button data-set-img-shape="web_editor/solid/solid_blob_4" data-select-label="Blob 4"/>
+                        <t t-if="not no_animations">
+                            <we-button data-set-img-shape="web_editor/solid/solid_blob_5" data-select-label="Blob 5" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/solid/solid_blob_shadow_1" data-select-label="Blob Shadow 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/solid/solid_blob_shadow_2" data-select-label="Blob Shadow 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/solid/solid_square_1" data-select-label="Square Shadow 1" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/solid/solid_square_2" data-select-label="Square Shadow 2" data-animated="true"/>
+                            <we-button data-set-img-shape="web_editor/solid/solid_square_3" data-select-label="Square Shadow 3" data-animated="true"/>
+                        </t>
                     </we-select-page>
+
                     <we-select-page string="Specials" t-if="not no_animations">
-                        <we-button data-set-img-shape="web_editor/special/spl_speed_1" data-select-label="Speed" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_rain_1" data-select-label="Rain" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_snow_1" data-select-label="Snow" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_flag_1" data-select-label="Flag" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_filter_1" data-select-label="Filter" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_organics_1" data-select-label="Organics" data-animated="true"/>
-                        <we-button data-set-img-shape="web_editor/special/spl_circuit_1" data-select-label="Circuit" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_speed" data-select-label="Speed" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_rain" data-select-label="Rain" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_snow" data-select-label="Snow" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_layered" data-select-label="Layered" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_filter" data-select-label="Filter" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_flag" data-select-label="Flag" data-animated="true"/>
+                        <we-button data-set-img-shape="web_editor/special/special_organic" data-select-label="Organic" data-animated="true"/>
                     </we-select-page>
+
                     <we-select-page string="Devices">
                         <we-button data-set-img-shape="web_editor/devices/iphone_front_portrait" data-select-label="iPhone #1" data-img-size="375 x 812"/>
                         <we-button data-set-img-shape="web_editor/devices/iphone_3d_portrait_01" data-select-label="iPhone #2" data-img-size="375 x 812"/>
@@ -565,11 +643,11 @@
                 <we-button data-set-img-shape="" data-no-preview="true" data-label="None" data-dependencies="shape_img_opt" class="o_we_image_shape_remove fa fa-fw fa-times"/>
             </we-row>
             <we-row string="Colors" class="o_we_sublevel_1">
-                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-0" data-color-id="0" />
-                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-1" data-color-id="1" />
-                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-2" data-color-id="2" />
-                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-3" data-color-id="3" />
-                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-4" data-color-id="4" />
+                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-0" data-color-id="0"/>
+                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-1" data-color-id="1"/>
+                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-2" data-color-id="2"/>
+                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-3" data-color-id="3"/>
+                <we-colorpicker data-set-img-shape-color="true" data-dependencies="shape_img_opt" data-name="img-shape-color-4" data-color-id="4"/>
             </we-row>
         </div>