diff --git a/theme_anelusia/views/snippets/s_accordion_image.xml b/theme_anelusia/views/snippets/s_accordion_image.xml
index b262964fc..c6ea0e226 100644
--- a/theme_anelusia/views/snippets/s_accordion_image.xml
+++ b/theme_anelusia/views/snippets/s_accordion_image.xml
@@ -6,7 +6,7 @@
         <attribute name="class" remove="o_cc o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/web_editor/solid/solid_square_1.svg?c2=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/html_builder/solid/solid_square_1.svg?c2=o-color-1</attribute>
         <attribute name="data-shape">html_builder/solid/solid_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_accordion_image_default_image.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_company_team.xml b/theme_anelusia/views/snippets/s_company_team.xml
index 7545377d5..86b0ed825 100644
--- a/theme_anelusia/views/snippets/s_company_team.xml
+++ b/theme_anelusia/views/snippets/s_company_team.xml
@@ -25,7 +25,7 @@
     </xpath>
     <!-- Team #01 - Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/geometric/geo_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/geometric/geo_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
@@ -51,7 +51,7 @@
     </xpath>
     <!-- Team #02 - Img -->
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/geometric/geo_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/geometric/geo_square_2.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_2.svg</attribute>
@@ -76,7 +76,7 @@
     </xpath>
     <!-- Team #03 - Img -->
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_3.svg</attribute>
@@ -101,7 +101,7 @@
     </xpath>
     <!-- Team #04 - Img -->
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/geometric/geo_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/geometric/geo_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_4.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_company_team_basic.xml b/theme_anelusia/views/snippets/s_company_team_basic.xml
index 58ddd442f..ae5e64d09 100644
--- a/theme_anelusia/views/snippets/s_company_team_basic.xml
+++ b/theme_anelusia/views/snippets/s_company_team_basic.xml
@@ -13,7 +13,7 @@
     <!-- Team #01 - Img -->
     <xpath expr="(//img)[1]" position="attributes">
         <attribute name="class" remove="rounded-circle" separator=" "/>
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/geometric/geo_square_6.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/geometric/geo_square_6.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_6</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
@@ -31,7 +31,7 @@
     <!-- Team #02 - Img -->
     <xpath expr="(//img)[2]" position="attributes">
         <attribute name="class" remove="rounded-circle" separator=" "/>
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/geometric/geo_square_4.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/geometric/geo_square_4.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_4</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_2.svg</attribute>
@@ -49,7 +49,7 @@
     <!-- Team #03 - Img -->
     <xpath expr="(//img)[3]" position="attributes">
         <attribute name="class" remove="rounded-circle" separator=" "/>
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_3.svg</attribute>
@@ -67,7 +67,7 @@
     <!-- Team #04 - Img -->
     <xpath expr="(//img)[4]" position="attributes">
         <attribute name="class" remove="rounded-circle" separator=" "/>
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/geometric/geo_square_5.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/geometric/geo_square_5.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_5</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_4.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_company_team_grid.xml b/theme_anelusia/views/snippets/s_company_team_grid.xml
index df374d5ec..f6ec53703 100644
--- a/theme_anelusia/views/snippets/s_company_team_grid.xml
+++ b/theme_anelusia/views/snippets/s_company_team_grid.xml
@@ -11,8 +11,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/composition/composition_square_4.svg?c2=o-color-2&amp;c5=o-color-3</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_square_4</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/composition/composition_square_4.svg?c2=o-color-2&amp;c5=o-color-3</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_square_4</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;o-color-2;;;o-color-3</attribute>
@@ -22,8 +22,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/solid/solid_square_2.svg?c1=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/solid/solid_square_2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/solid/solid_square_2.svg?c1=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/solid/solid_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_2.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;;;;</attribute>
@@ -33,8 +33,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/composition/composition_square_2.svg?c2=o-color-3&amp;c5=o-color-2</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_square_2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/composition/composition_square_2.svg?c2=o-color-3&amp;c5=o-color-2</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_3.svg</attribute>
         <attribute name="data-shape-colors">;o-color-3;;;o-color-2</attribute>
@@ -44,8 +44,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/composition/composition_square_1.svg?c1=o-color-3&amp;c2=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_square_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/composition/composition_square_1.svg?c1=o-color-3&amp;c2=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_4.svg</attribute>
         <attribute name="data-shape-colors">o-color-3;o-color-1;;;</attribute>
@@ -55,8 +55,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/web_editor/solid/solid_square_1.svg?c2=o-color-2</attribute>
-        <attribute name="data-shape">web_editor/solid/solid_square_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/html_builder/solid/solid_square_1.svg?c2=o-color-2</attribute>
+        <attribute name="data-shape">html_builder/solid/solid_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_5.svg</attribute>
         <attribute name="data-shape-colors">;o-color-2;;;</attribute>
@@ -66,8 +66,8 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/web_editor/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-3</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_square_3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/html_builder/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-3</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_6.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;;;;o-color-3</attribute>
diff --git a/theme_anelusia/views/snippets/s_image_text.xml b/theme_anelusia/views/snippets/s_image_text.xml
index d48dd75d3..b93c2dba5 100644
--- a/theme_anelusia/views/snippets/s_image_text.xml
+++ b/theme_anelusia/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/composition/composition_square_1.svg?c1=o-color-1&amp;c2=o-color-3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/composition/composition_square_1.svg?c1=o-color-1&amp;c2=o-color-3</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_key_images.xml b/theme_anelusia/views/snippets/s_key_images.xml
index 5a883a221..32103f2f4 100644
--- a/theme_anelusia/views/snippets/s_key_images.xml
+++ b/theme_anelusia/views/snippets/s_key_images.xml
@@ -7,14 +7,14 @@
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_key_images_default_image_1/web_editor/geometric/geo_square_6.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_key_images_default_image_1/html_builder/geometric/geo_square_6.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_6</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_key_images_default_image_1.svg</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_key_images_default_image_4/web_editor/geometric/geo_square_5.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_key_images_default_image_4/html_builder/geometric/geo_square_5.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_5</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_key_images_default_image_4.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_media_list.xml b/theme_anelusia/views/snippets/s_media_list.xml
index 48ce26a58..9530a81e1 100644
--- a/theme_anelusia/views/snippets/s_media_list.xml
+++ b/theme_anelusia/views/snippets/s_media_list.xml
@@ -17,7 +17,7 @@
     </xpath>
     <!-- Media #01 - Img -->
     <xpath expr="//div[hasclass('s_media_list_img_wrapper')]//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/web_editor/composition/composition_square_1.svg?c1=o-color-4&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/html_builder/composition/composition_square_1.svg?c1=o-color-4&amp;c2=o-color-2</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_1.svg</attribute>
@@ -46,7 +46,7 @@
     </xpath>
     <!-- Media #02 - Img -->
     <xpath expr="(//div[hasclass('s_media_list_img_wrapper')])[2]//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/web_editor/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/html_builder/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-2</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_2.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_product_list.xml b/theme_anelusia/views/snippets/s_product_list.xml
index b9018399b..5073b8d10 100644
--- a/theme_anelusia/views/snippets/s_product_list.xml
+++ b/theme_anelusia/views/snippets/s_product_list.xml
@@ -27,7 +27,7 @@
     </xpath>
     <!-- Item #1 - Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_1/web_editor/geometric/geo_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_1/html_builder/geometric/geo_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_1.svg</attribute>
@@ -35,7 +35,7 @@
     </xpath>
     <!-- Item #2 - Img -->
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_2/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_2/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_2.svg</attribute>
@@ -43,7 +43,7 @@
     </xpath>
     <!-- Item #3 - Img -->
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_3/web_editor/geometric/geo_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_3/html_builder/geometric/geo_square_2.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_3.svg</attribute>
@@ -51,7 +51,7 @@
     </xpath>
     <!-- Item #4 - Img -->
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_4/web_editor/geometric/geo_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_4/html_builder/geometric/geo_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_4.svg</attribute>
@@ -59,7 +59,7 @@
     </xpath>
     <!-- Item #5 - Img -->
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_5/web_editor/geometric/geo_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_5/html_builder/geometric/geo_square_2.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_5.svg</attribute>
@@ -67,7 +67,7 @@
     </xpath>
     <!-- Item #6 - Img -->
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_6/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_product_list_default_image_6/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_product_6.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_text_image.xml b/theme_anelusia/views/snippets/s_text_image.xml
index 623dc235e..9656d8563 100644
--- a/theme_anelusia/views/snippets/s_text_image.xml
+++ b/theme_anelusia/views/snippets/s_text_image.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/composition/composition_square_3.svg?c1=o-color-2&amp;c5=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/composition/composition_square_3.svg?c1=o-color-2&amp;c5=o-color-1</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
diff --git a/theme_anelusia/views/snippets/s_wavy_grid.xml b/theme_anelusia/views/snippets/s_wavy_grid.xml
index cf532b9a4..d9d7adaf5 100644
--- a/theme_anelusia/views/snippets/s_wavy_grid.xml
+++ b/theme_anelusia/views/snippets/s_wavy_grid.xml
@@ -9,14 +9,14 @@
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_wavy_grid_default_image_1/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_wavy_grid_default_image_1/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_wavy_grid_default_image_1.svg</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_wavy_grid_default_image_4/web_editor/geometric/geo_square_6.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_wavy_grid_default_image_4/html_builder/geometric/geo_square_6.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_6</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_wavy_grid_default_image_4.svg</attribute>
diff --git a/theme_artists/views/snippets/s_accordion_image.xml b/theme_artists/views/snippets/s_accordion_image.xml
index db0ca972a..d41bd5ef7 100644
--- a/theme_artists/views/snippets/s_accordion_image.xml
+++ b/theme_artists/views/snippets/s_accordion_image.xml
@@ -6,7 +6,7 @@
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_accordion_image_default_image.svg</attribute>
diff --git a/theme_artists/views/snippets/s_image_text.xml b/theme_artists/views/snippets/s_image_text.xml
index 2c805a85a..487cd0412 100644
--- a/theme_artists/views/snippets/s_image_text.xml
+++ b/theme_artists/views/snippets/s_image_text.xml
@@ -15,7 +15,7 @@
     </xpath>
     <!-- Picture -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_artists/views/snippets/s_numbers_boxed.xml b/theme_artists/views/snippets/s_numbers_boxed.xml
index 20d713048..19e7c9acf 100644
--- a/theme_artists/views/snippets/s_numbers_boxed.xml
+++ b/theme_artists/views/snippets/s_numbers_boxed.xml
@@ -4,7 +4,7 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Float/12", "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Float/12", "flip":[], "showOnMobile":true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
diff --git a/theme_artists/views/snippets/s_shape_image.xml b/theme_artists/views/snippets/s_shape_image.xml
index 6ab08d460..35640746a 100644
--- a/theme_artists/views/snippets/s_shape_image.xml
+++ b/theme_artists/views/snippets/s_shape_image.xml
@@ -9,7 +9,7 @@
 
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_shape_image_default_image/web_editor/geometric/geo_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_shape_image_default_image/html_builder/geometric/geo_square_1.svg</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_artists/views/snippets/s_text_image.xml b/theme_artists/views/snippets/s_text_image.xml
index 885ddd82c..d8a818638 100644
--- a/theme_artists/views/snippets/s_text_image.xml
+++ b/theme_artists/views/snippets/s_text_image.xml
@@ -22,7 +22,7 @@
         <attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/geometric/geo_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/geometric/geo_square_2.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 5cb79702b..a27f33f75 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -124,7 +124,7 @@
         We combine a wide spectrum of technologies with a good portion of creativity.
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/web_editor/panel/panel_duo_step.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/html_builder/panel/panel_duo_step.svg</attribute>
         <attribute name="data-shape">html_builder/panel/panel_duo_step</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">bg_image_14.svg</attribute>
@@ -209,7 +209,7 @@
         <attribute name="class" add="btn-lg" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/panel/panel_trio_out_r.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/panel/panel_trio_out_r.svg</attribute>
         <attribute name="data-shape">html_builder/panel/panel_trio_out_r</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">bg_image_13.svg</attribute>
@@ -810,7 +810,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
@@ -821,7 +821,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-shape-rotate">90</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
@@ -833,7 +833,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-shape-flip">x</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
@@ -845,7 +845,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-shape-flip">y</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
@@ -857,7 +857,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
@@ -868,7 +868,7 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/web_editor/geometric_round/geo_round_gem.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/html_builder/geometric_round/geo_round_gem.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_gem</attribute>
         <attribute name="data-shape-flip">xy</attribute>
         <attribute name="data-format-mimetype">image/jpeg</attribute>
diff --git a/theme_beauty/views/snippets/s_accordion_image.xml b/theme_beauty/views/snippets/s_accordion_image.xml
index 560365436..8a98413e0 100644
--- a/theme_beauty/views/snippets/s_accordion_image.xml
+++ b/theme_beauty/views/snippets/s_accordion_image.xml
@@ -6,7 +6,7 @@
         <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/web_editor/geometric_round/geo_round_blob_soft.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/html_builder/geometric_round/geo_round_blob_soft.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_soft</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_accordion_image_default_image.svg</attribute>
diff --git a/theme_beauty/views/snippets/s_image_text.xml b/theme_beauty/views/snippets/s_image_text.xml
index bc23c83be..fe0018b77 100644
--- a/theme_beauty/views/snippets/s_image_text.xml
+++ b/theme_beauty/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/pattern/pattern_wave_3.svg?c1=o-color-1&amp;c3=o-color-4</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/pattern/pattern_wave_3.svg?c1=o-color-1&amp;c3=o-color-4</attribute>
         <attribute name="data-shape">html_builder/pattern/pattern_wave_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_beauty/views/snippets/s_media_list.xml b/theme_beauty/views/snippets/s_media_list.xml
index bcdee3e58..72b42f879 100644
--- a/theme_beauty/views/snippets/s_media_list.xml
+++ b/theme_beauty/views/snippets/s_media_list.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Item #1 - img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/web_editor/composition/composition_line_2.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/html_builder/composition/composition_line_2.svg?c1=o-color-1</attribute>
         <attribute name="data-shape">html_builder/composition/composition_line_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_1.svg</attribute>
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Item #2 - img -->
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/web_editor/composition/composition_line_3.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/html_builder/composition/composition_line_3.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-3</attribute>
         <attribute name="data-shape">html_builder/composition/composition_line_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_2.svg</attribute>
@@ -24,7 +24,7 @@
     </xpath>
     <!-- Item #3 - img -->
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_3/web_editor/composition/composition_line_2.svg?c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_3/html_builder/composition/composition_line_2.svg?c2=o-color-2</attribute>
         <attribute name="data-shape">html_builder/composition/composition_line_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_3.svg</attribute>
diff --git a/theme_beauty/views/snippets/s_text_image.xml b/theme_beauty/views/snippets/s_text_image.xml
index e7a96976a..7389721cb 100644
--- a/theme_beauty/views/snippets/s_text_image.xml
+++ b/theme_beauty/views/snippets/s_text_image.xml
@@ -18,7 +18,7 @@
     <xpath expr="//p[2]" position="replace"/>
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/pattern/pattern_wave_4.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/pattern/pattern_wave_4.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1</attribute>
         <attribute name="data-shape">html_builder/pattern/pattern_wave_4</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
diff --git a/theme_bistro/views/snippets/s_text_image.xml b/theme_bistro/views/snippets/s_text_image.xml
index f4793816a..1909395c3 100644
--- a/theme_bistro/views/snippets/s_text_image.xml
+++ b/theme_bistro/views/snippets/s_text_image.xml
@@ -4,7 +4,7 @@
 <template id="s_text_image" inherit_id="website.s_text_image">
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/geometric_round/geo_round_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/geometric_round/geo_round_square_2.svg</attribute>
         <attribute name="data-file-name">text_image.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_square_2</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
diff --git a/theme_buzzy/views/snippets/s_image_punchy.xml b/theme_buzzy/views/snippets/s_image_punchy.xml
index aebd07e0c..5095211e5 100644
--- a/theme_buzzy/views/snippets/s_image_punchy.xml
+++ b/theme_buzzy/views/snippets/s_image_punchy.xml
@@ -3,7 +3,7 @@
 
 <template id="s_image_punchy" inherit_id="website.s_image_punchy">
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_punchy_default_image/web_editor/geometric/geo_slanted.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_punchy_default_image/html_builder/geometric/geo_slanted.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_slanted</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_punchy_default_image.svg</attribute>
diff --git a/theme_clean/views/snippets/s_banner.xml b/theme_clean/views/snippets/s_banner.xml
index 70835a4fb..4380c60fd 100644
--- a/theme_clean/views/snippets/s_banner.xml
+++ b/theme_clean/views/snippets/s_banner.xml
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_banner_default_image_2/web_editor/composition/composition_oval_line.svg?c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_banner_default_image_2/html_builder/composition/composition_oval_line.svg?c2=o-color-2</attribute>
         <attribute name="data-shape">html_builder/composition/composition_oval_line</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_banner_2.svg</attribute>
diff --git a/theme_clean/views/snippets/s_image_text.xml b/theme_clean/views/snippets/s_image_text.xml
index 5caf91935..b9cd5dc12 100644
--- a/theme_clean/views/snippets/s_image_text.xml
+++ b/theme_clean/views/snippets/s_image_text.xml
@@ -12,7 +12,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/pattern/pattern_labyrinth.svg?c1=o-color-3&amp;c2=o-color-5&amp;c4=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/pattern/pattern_labyrinth.svg?c1=o-color-3&amp;c2=o-color-5&amp;c4=o-color-1</attribute>
         <attribute name="data-shape">html_builder/pattern/pattern_labyrinth</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">image_content_20.svg</attribute>
diff --git a/theme_clean/views/snippets/s_text_image.xml b/theme_clean/views/snippets/s_text_image.xml
index 663f4d8cd..51e3946c6 100644
--- a/theme_clean/views/snippets/s_text_image.xml
+++ b/theme_clean/views/snippets/s_text_image.xml
@@ -18,7 +18,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/pattern/pattern_point.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/pattern/pattern_point.svg?c1=o-color-1</attribute>
         <attribute name="data-shape">html_builder/pattern/pattern_point</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">image_content_19.svg</attribute>
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index a65c4e74b..8562b2542 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -58,7 +58,7 @@
         </div>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_device_perspective/web_editor/devices/iphone_3d_portrait_02.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_device_perspective/html_builder/devices/iphone_3d_portrait_02.svg</attribute>
         <attribute name="data-shape">html_builder/devices/iphone_3d_portrait_02</attribute>
     </xpath>
     <xpath expr="//p[1]" position="replace" mode="inner">
diff --git a/theme_kea/views/snippets/s_company_team_grid.xml b/theme_kea/views/snippets/s_company_team_grid.xml
index ac1f2d5ab..64382b745 100644
--- a/theme_kea/views/snippets/s_company_team_grid.xml
+++ b/theme_kea/views/snippets/s_company_team_grid.xml
@@ -7,8 +7,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/composition/composition_line_1.svg?c1=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_line_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/composition/composition_line_1.svg?c1=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_line_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;;;;</attribute>
@@ -18,8 +18,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/composition/composition_mixed_1.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_mixed_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/composition/composition_mixed_1.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_mixed_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;o-color-2;;;o-color-5</attribute>
@@ -29,8 +29,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/composition/composition_planet_1.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_planet_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/composition/composition_planet_1.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_planet_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;o-color-2;;;o-color-5</attribute>
@@ -40,8 +40,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/composition/composition_planet_2.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_planet_2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/composition/composition_planet_2.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_planet_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;o-color-2;;;o-color-5</attribute>
@@ -51,8 +51,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/web_editor/pattern/pattern_point.svg?c1=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/pattern/pattern_point</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/html_builder/pattern/pattern_point.svg?c1=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/pattern/pattern_point</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;;;;</attribute>
@@ -62,8 +62,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/web_editor/composition/composition_mixed_2.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_mixed_2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/html_builder/composition/composition_mixed_2.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_mixed_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-1;o-color-2;;;o-color-5</attribute>
diff --git a/theme_kea/views/snippets/s_image_hexagonal.xml b/theme_kea/views/snippets/s_image_hexagonal.xml
index edaf59452..a264866c3 100644
--- a/theme_kea/views/snippets/s_image_hexagonal.xml
+++ b/theme_kea/views/snippets/s_image_hexagonal.xml
@@ -4,7 +4,7 @@
 <template id="s_image_hexagonal" inherit_id="website.s_image_hexagonal">
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/web_editor/composition/composition_mixed_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/html_builder/composition/composition_mixed_1.svg</attribute>
         <attribute name="data-shape">html_builder/composition/composition_mixed_1</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
diff --git a/theme_kea/views/snippets/s_media_list.xml b/theme_kea/views/snippets/s_media_list.xml
index ac9f43363..566ac9aa7 100644
--- a/theme_kea/views/snippets/s_media_list.xml
+++ b/theme_kea/views/snippets/s_media_list.xml
@@ -22,7 +22,7 @@
         <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
     </xpath>
     <xpath expr="(//img)" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_3/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_3/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_3.svg</attribute>
@@ -39,7 +39,7 @@
         <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_2/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_2.svg</attribute>
@@ -56,7 +56,7 @@
         <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_1.svg</attribute>
diff --git a/theme_kea/views/snippets/s_picture.xml b/theme_kea/views/snippets/s_picture.xml
index ab52ce96b..b8bd2c498 100644
--- a/theme_kea/views/snippets/s_picture.xml
+++ b/theme_kea/views/snippets/s_picture.xml
@@ -13,7 +13,7 @@
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="style">width: 100%;</attribute>
-        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_media_list_default_image_1/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_1.svg</attribute>
diff --git a/theme_kiddo/views/snippets/s_accordion_image.xml b/theme_kiddo/views/snippets/s_accordion_image.xml
index a2cfcf173..7ab8c5239 100644
--- a/theme_kiddo/views/snippets/s_accordion_image.xml
+++ b/theme_kiddo/views/snippets/s_accordion_image.xml
@@ -3,7 +3,7 @@
 
 <template id="s_accordion_image" inherit_id="website.s_accordion_image">
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_accordion_image_default_image/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_accordion_image_default_image.svg</attribute>
diff --git a/theme_kiddo/views/snippets/s_company_team_grid.xml b/theme_kiddo/views/snippets/s_company_team_grid.xml
index 64aa57829..8c703a049 100644
--- a/theme_kiddo/views/snippets/s_company_team_grid.xml
+++ b/theme_kiddo/views/snippets/s_company_team_grid.xml
@@ -7,8 +7,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/solid/solid_blob_3.svg?c5=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/composition/solid_blob_3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/solid/solid_blob_3.svg?c5=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/composition/solid_blob_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;;;;o-color-1</attribute>
@@ -18,8 +18,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/composition/composition_organic_line.svg?c1=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_organic_line</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/composition/composition_organic_line.svg?c1=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_organic_line</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">o-color-5;;;;</attribute>
@@ -29,8 +29,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/solid/solid_blob_1.svg?c2=o-color-2</attribute>
-        <attribute name="data-shape">web_editor/solid/solid_blob_1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/solid/solid_blob_1.svg?c2=o-color-2</attribute>
+        <attribute name="data-shape">html_builder/solid/solid_blob_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;o-color-2;;;</attribute>
@@ -40,8 +40,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/solid/solid_blob_4.svg?c5=o-color-2</attribute>
-        <attribute name="data-shape">web_editor/solid/solid_blob_4</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/solid/solid_blob_4.svg?c5=o-color-2</attribute>
+        <attribute name="data-shape">html_builder/solid/solid_blob_4</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;;;;o-color-2</attribute>
@@ -51,8 +51,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/web_editor/composition/composition_oval_line.svg?c2=o-color-1</attribute>
-        <attribute name="data-shape">web_editor/composition/composition_oval_line</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/html_builder/composition/composition_oval_line.svg?c2=o-color-1</attribute>
+        <attribute name="data-shape">html_builder/composition/composition_oval_line</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;o-color-1;;;</attribute>
@@ -62,8 +62,8 @@
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/web_editor/solid/solid_blob_3.svg?c5=o-color-5</attribute>
-        <attribute name="data-shape">web_editor/solid/solid_blob_3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/html_builder/solid/solid_blob_3.svg?c5=o-color-5</attribute>
+        <attribute name="data-shape">html_builder/solid/solid_blob_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
         <attribute name="data-shape-colors">;;;;o-color-5</attribute>
diff --git a/theme_kiddo/views/snippets/s_image_hexagonal.xml b/theme_kiddo/views/snippets/s_image_hexagonal.xml
index 5a183e7c0..f9be5e6e6 100644
--- a/theme_kiddo/views/snippets/s_image_hexagonal.xml
+++ b/theme_kiddo/views/snippets/s_image_hexagonal.xml
@@ -13,7 +13,7 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.library_image_05/web_editor/composition/composition_mixed_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.library_image_05/html_builder/composition/composition_mixed_1.svg</attribute>
         <attribute name="data-shape">html_builder/composition/composition_mixed_1</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
index 360eda0b4..cec10c5fc 100644
--- a/theme_kiddo/views/snippets/s_image_text.xml
+++ b/theme_kiddo/views/snippets/s_image_text.xml
@@ -34,7 +34,7 @@
 
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/geometric_round/geo_round_square_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/geometric_round/geo_round_square_2.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_kiddo/views/snippets/s_text_image.xml b/theme_kiddo/views/snippets/s_text_image.xml
index 6eac4c473..c0cc74e20 100644
--- a/theme_kiddo/views/snippets/s_text_image.xml
+++ b/theme_kiddo/views/snippets/s_text_image.xml
@@ -22,7 +22,7 @@
 
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/geometric_round/geo_round_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/geometric_round/geo_round_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_square_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">content_img_13.svg</attribute>
diff --git a/theme_kiddo/views/snippets/s_three_columns.xml b/theme_kiddo/views/snippets/s_three_columns.xml
index ea1fc8469..7ee318dc8 100644
--- a/theme_kiddo/views/snippets/s_three_columns.xml
+++ b/theme_kiddo/views/snippets/s_three_columns.xml
@@ -12,7 +12,7 @@
         <attribute name="style">border-width: 0px !important;</attribute>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_1/web_editor/solid/solid_blob_1.svg?c2=o-color-1</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_1/html_builder/solid/solid_blob_1.svg?c2=o-color-1</attribute>
         <attribute name="data-shape">html_builder/solid/solid_blob_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_three_columns_default_image_1.svg</attribute>
@@ -49,7 +49,7 @@
         <attribute name="style">border-width: 0px !important;</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_2/web_editor/composition/composition_organic_line.svg?c2=o-color-3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_2/html_builder/composition/composition_organic_line.svg?c2=o-color-3</attribute>
         <attribute name="data-shape">html_builder/composition/composition_organic_line</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_three_columns_default_image_2.svg</attribute>
@@ -86,7 +86,7 @@
         <attribute name="style">border-width: 0px !important;</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_3/web_editor/solid/solid_blob_3.svg?c5=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_three_columns_default_image_3/html_builder/solid/solid_blob_3.svg?c5=o-color-2</attribute>
         <attribute name="data-shape">html_builder/solid/solid_blob_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_three_columns_default_image_3.svg</attribute>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index f1e3d8f3b..a81107893 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -167,7 +167,7 @@
         <attribute name="class" remove="col-lg-5" add="col-lg-4 offset-lg-1" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/geometric/geo_square_3.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/geometric/geo_square_3.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
@@ -198,7 +198,7 @@
     </xpath>
     <xpath expr="//p[2]" position="replace"/>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/geometric/geo_square_6.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/geometric/geo_square_6.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_6</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
@@ -882,7 +882,7 @@
     <xpath expr="//p[2]" position="replace"/>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_masonry_block_default_image_1/web_editor/panel/panel_duo_step.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_masonry_block_default_image_1/html_builder/panel/panel_duo_step.svg</attribute>
         <attribute name="data-shape">html_builder/panel/panel_duo_step</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_masonry_block_default_image_1.webp</attribute>
@@ -950,7 +950,7 @@
         <h3 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_bold o_text_highlight_fill" style="--text-highlight-width: 3px; --text-highlight-color: #AFF8C8;">Tony Fred</span></h3>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_1/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_1.svg</attribute>
@@ -962,7 +962,7 @@
     </xpath>
 
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_2/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_2.svg</attribute>
@@ -973,7 +973,7 @@
         <h3 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_bold_1 o_text_highlight_fill" style="--text-highlight-width: 3px; --text-highlight-color: #AFF8C8;">Aline Turner</span></h3>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_3/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_3.svg</attribute>
@@ -984,7 +984,7 @@
         <h3 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_bold o_text_highlight_fill" style="--text-highlight-width: 3px;">Iris Joe</span></h3>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_4/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_4.svg</attribute>
@@ -995,7 +995,7 @@
         <h3 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_bold o_text_highlight_fill" style="--text-highlight-width: 3px; --text-highlight-color: #AFF8C8;">Pete Bluestork</span></h3>
     </xpath>
     <xpath expr="(//img)[5]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_5/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_5.svg</attribute>
@@ -1006,7 +1006,7 @@
         <h3 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_bold o_text_highlight_fill" style="--text-highlight-width: 3px;">Sophia Langston</span></h3>
     </xpath>
     <xpath expr="(//img)[6]" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/web_editor/geometric_round/geo_round_diamond.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_company_team_image_6/html_builder/geometric_round/geo_round_diamond.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_diamond</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">uiface_6.svg</attribute>
diff --git a/theme_nano/views/snippets/s_image_text.xml b/theme_nano/views/snippets/s_image_text.xml
index 29ade4178..34e19ba6b 100644
--- a/theme_nano/views/snippets/s_image_text.xml
+++ b/theme_nano/views/snippets/s_image_text.xml
@@ -11,7 +11,7 @@
     </xpath>
     <!-- Image + Shape -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/composition/composition_planet_2.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/composition/composition_planet_2.svg</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
         <attribute name="data-shape">html_builder/composition/composition_planet_2</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
diff --git a/theme_nano/views/snippets/s_text_image.xml b/theme_nano/views/snippets/s_text_image.xml
index 8bda97fe1..cca3cc2f7 100644
--- a/theme_nano/views/snippets/s_text_image.xml
+++ b/theme_nano/views/snippets/s_text_image.xml
@@ -11,7 +11,7 @@
     </xpath>
     <!-- Image + Shape -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/pattern/pattern_point.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/pattern/pattern_point.svg</attribute>
             <attribute name="data-file-name">s_text_image.svg</attribute>
         <attribute name="data-shape">html_builder/pattern/pattern_point</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_image_text.xml b/theme_odoo_experts/views/snippets/s_image_text.xml
index bfdc145f6..dcdbc03d0 100644
--- a/theme_odoo_experts/views/snippets/s_image_text.xml
+++ b/theme_odoo_experts/views/snippets/s_image_text.xml
@@ -25,7 +25,7 @@
 
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/devices/browser_03.svg?</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/devices/browser_03.svg?</attribute>
         <attribute name="data-shape">html_builder/devices/browser_03</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_mockup_image.xml b/theme_odoo_experts/views/snippets/s_mockup_image.xml
index 66271dd19..2197d557d 100644
--- a/theme_odoo_experts/views/snippets/s_mockup_image.xml
+++ b/theme_odoo_experts/views/snippets/s_mockup_image.xml
@@ -26,7 +26,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_device_perspective/web_editor/devices/iphone_3d_portrait_02.svg?c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_device_perspective/html_builder/devices/iphone_3d_portrait_02.svg?c5=o-color-5</attribute>
         <attribute name="data-shape">html_builder/devices/iphone_3d_portrait_02</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text_device_perspective.svg</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_picture.xml b/theme_odoo_experts/views/snippets/s_picture.xml
index cbf69ac39..13037d57a 100644
--- a/theme_odoo_experts/views/snippets/s_picture.xml
+++ b/theme_odoo_experts/views/snippets/s_picture.xml
@@ -33,7 +33,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//div[hasclass('col-lg-12')]//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/web_editor/devices/macbook_front.svg?c3=o-color-3</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/html_builder/devices/macbook_front.svg?c3=o-color-3</attribute>
         <attribute name="data-shape">html_builder/devices/macbook_front</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_picture.svg</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_showcase.xml b/theme_odoo_experts/views/snippets/s_showcase.xml
index df85fd997..80bc649f2 100644
--- a/theme_odoo_experts/views/snippets/s_showcase.xml
+++ b/theme_odoo_experts/views/snippets/s_showcase.xml
@@ -44,7 +44,7 @@
 
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_showcase_default_image/web_editor/devices/macbook_front.svg?</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_showcase_default_image/html_builder/devices/macbook_front.svg?</attribute>
         <attribute name="data-shape">html_builder/devices/macbook_front</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_showcase_default_image.svg</attribute>
diff --git a/theme_odoo_experts/views/snippets/s_text_image.xml b/theme_odoo_experts/views/snippets/s_text_image.xml
index a0e07c47a..dcd2a76cf 100644
--- a/theme_odoo_experts/views/snippets/s_text_image.xml
+++ b/theme_odoo_experts/views/snippets/s_text_image.xml
@@ -25,7 +25,7 @@
 
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/devices/ipad_front_landscape.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/devices/ipad_front_landscape.svg</attribute>
         <attribute name="data-shape">html_builder/devices/ipad_front_landscape</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
diff --git a/theme_orchid/views/snippets/s_image_hexagonal.xml b/theme_orchid/views/snippets/s_image_hexagonal.xml
index 3ab07ca17..1db3488be 100644
--- a/theme_orchid/views/snippets/s_image_hexagonal.xml
+++ b/theme_orchid/views/snippets/s_image_hexagonal.xml
@@ -12,7 +12,7 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_masonry_block_default_image_1/web_editor/composition/composition_square_1.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_masonry_block_default_image_1/html_builder/composition/composition_square_1.svg</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_1</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
diff --git a/theme_orchid/views/snippets/s_image_text.xml b/theme_orchid/views/snippets/s_image_text.xml
index 9d1986317..bb11d07c9 100644
--- a/theme_orchid/views/snippets/s_image_text.xml
+++ b/theme_orchid/views/snippets/s_image_text.xml
@@ -19,7 +19,7 @@
     </xpath>
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/composition/composition_mixed_1.svg?c1=o-color-2&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/composition/composition_mixed_1.svg?c1=o-color-2&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
         <attribute name="data-shape">html_builder/composition/composition_mixed_1</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_carousel_2.svg</attribute>
diff --git a/theme_orchid/views/snippets/s_text_image.xml b/theme_orchid/views/snippets/s_text_image.xml
index 125d4eef6..dc0a52064 100644
--- a/theme_orchid/views/snippets/s_text_image.xml
+++ b/theme_orchid/views/snippets/s_text_image.xml
@@ -32,7 +32,7 @@
     </xpath>
     <!-- Img -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/solid/solid_blob_shadow_2.svg?c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/solid/solid_blob_shadow_2.svg?c2=o-color-2</attribute>
         <attribute name="data-shape">html_builder/solid/solid_blob_shadow_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_media_list_3.svg</attribute>
diff --git a/theme_real_estate/views/snippets/s_image_text.xml b/theme_real_estate/views/snippets/s_image_text.xml
index a2ae84d5c..49e8ea6f9 100644
--- a/theme_real_estate/views/snippets/s_image_text.xml
+++ b/theme_real_estate/views/snippets/s_image_text.xml
@@ -20,7 +20,7 @@
 
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/panel/panel_duo_step.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/panel/panel_duo_step.svg</attribute>
         <attribute name="data-shape">html_builder/panel/panel_duo_step</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_real_estate/views/snippets/s_text_image.xml b/theme_real_estate/views/snippets/s_text_image.xml
index c11683049..d119d654a 100644
--- a/theme_real_estate/views/snippets/s_text_image.xml
+++ b/theme_real_estate/views/snippets/s_text_image.xml
@@ -15,7 +15,7 @@
     <xpath expr="//p[2]" position="replace" />
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/panel/panel_duo_step.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/panel/panel_duo_step.svg</attribute>
         <attribute name="data-shape">html_builder/panel/panel_duo_step</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
diff --git a/theme_treehouse/views/snippets/s_picture.xml b/theme_treehouse/views/snippets/s_picture.xml
index 0465deb39..f1ccc0290 100644
--- a/theme_treehouse/views/snippets/s_picture.xml
+++ b/theme_treehouse/views/snippets/s_picture.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Image + Shape -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/web_editor/special/special_filter.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_picture_default_image/html_builder/special/special_filter.svg</attribute>
         <attribute name="data-file-name">01.svg</attribute>
         <attribute name="data-shape">html_builder/special/special_filter</attribute>
         <attribute name="data-shape-colors">;#046380;;;</attribute>
diff --git a/theme_treehouse/views/snippets/s_text_image.xml b/theme_treehouse/views/snippets/s_text_image.xml
index 00053ef7f..73afd6bb2 100644
--- a/theme_treehouse/views/snippets/s_text_image.xml
+++ b/theme_treehouse/views/snippets/s_text_image.xml
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Image + Shape -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/geometric_round/geo_round_blob_medium.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/geometric_round/geo_round_blob_medium.svg</attribute>
         <attribute name="data-file-name">text_image.svg</attribute>
         <attribute name="data-shape">html_builder/geometric_round/geo_round_blob_medium</attribute>
         <attribute name="data-shape-colors">;;;;</attribute>
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 36d0779a5..3772c8073 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -60,7 +60,7 @@
         <attribute name="class" add="pb24 pt56 o_cc o_cc1" remove="pt80 pb80" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/web_editor/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_image_default_image/html_builder/composition/composition_square_3.svg?c1=o-color-1&amp;c5=o-color-5</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_3</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_text_image.svg</attribute>
@@ -89,7 +89,7 @@
         <attribute name="class" add="pb56 pt24 o_cc o_cc1" remove="pt80 pb80" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/web_editor/composition/composition_square_2.svg?c2=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_image_text_default_image/html_builder/composition/composition_square_2.svg?c2=o-color-1&amp;c5=o-color-5</attribute>
         <attribute name="data-shape">html_builder/composition/composition_square_2</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_image_text.svg</attribute>
diff --git a/theme_zap/views/snippets/s_striped.xml b/theme_zap/views/snippets/s_striped.xml
index 473f28829..16fe1e5a3 100644
--- a/theme_zap/views/snippets/s_striped.xml
+++ b/theme_zap/views/snippets/s_striped.xml
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/html_editor/image_shape/website.s_text_cover_default_image/web_editor/geometric/geo_square_5.svg</attribute>
+        <attribute name="src">/html_editor/image_shape/website.s_text_cover_default_image/html_builder/geometric/geo_square_5.svg</attribute>
         <attribute name="data-shape">html_builder/geometric/geo_square_5</attribute>
         <attribute name="data-format-mimetype">image/webp</attribute>
         <attribute name="data-file-name">s_striped_default_image.svg</attribute>