diff --git a/theme_anelusia/views/new_page_template.xml b/theme_anelusia/views/new_page_template.xml
index efc73b231..a037bae13 100644
--- a/theme_anelusia/views/new_page_template.xml
+++ b/theme_anelusia/views/new_page_template.xml
@@ -10,7 +10,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Containers_06" style="background-image: url('/web_editor/shape/html_builder/Containers/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Containers_06" style="background-image: url('/html_editor/shape/html_builder/Containers/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_anelusia/views/snippets/s_numbers.xml b/theme_anelusia/views/snippets/s_numbers.xml
index be7d410d2..7dc911bbb 100644
--- a/theme_anelusia/views/snippets/s_numbers.xml
+++ b/theme_anelusia/views/snippets/s_numbers.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
 </template>
 
diff --git a/theme_anelusia/views/snippets/s_numbers_boxed.xml b/theme_anelusia/views/snippets/s_numbers_boxed.xml
index cf94ccbd4..6c9f73097 100644
--- a/theme_anelusia/views/snippets/s_numbers_boxed.xml
+++ b/theme_anelusia/views/snippets/s_numbers_boxed.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Patterns_05" style="background-image: url('/web_editor/shape/html_builder/Patterns/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Patterns_05" style="background-image: url('/html_editor/shape/html_builder/Patterns/05.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_anelusia/views/snippets/s_product_catalog.xml b/theme_anelusia/views/snippets/s_product_catalog.xml
index dc2f1a135..5e2149360 100644
--- a/theme_anelusia/views/snippets/s_product_catalog.xml
+++ b/theme_anelusia/views/snippets/s_product_catalog.xml
@@ -11,7 +11,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/web_editor/shape/html_builder/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/html_editor/shape/html_builder/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Remove filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
diff --git a/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml b/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
index f89b99361..48d624e19 100644
--- a/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_01_001" style="background-image: url('/web_editor/shape/html_builder/Airy/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_01_001" style="background-image: url('/html_editor/shape/html_builder/Airy/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
         <attribute name="class" add="pb144" remove="pb80" separator=" "/>
diff --git a/theme_artists/views/new_page_template.xml b/theme_artists/views/new_page_template.xml
index 8fc61d11d..eb104b939 100644
--- a/theme_artists/views/new_page_template.xml
+++ b/theme_artists/views/new_page_template.xml
@@ -10,7 +10,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -21,7 +21,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -38,7 +38,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -76,7 +76,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -97,7 +97,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -182,7 +182,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -195,7 +195,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -220,7 +220,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -278,7 +278,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_attributes_horizontal.xml b/theme_artists/views/snippets/s_attributes_horizontal.xml
index b3b334738..c597983d8 100644
--- a/theme_artists/views/snippets/s_attributes_horizontal.xml
+++ b/theme_artists/views/snippets/s_attributes_horizontal.xml
@@ -8,16 +8,16 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_2.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_2.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_attributes_vertical.xml b/theme_artists/views/snippets/s_attributes_vertical.xml
index 8ca70a51c..cd88d2416 100644
--- a/theme_artists/views/snippets/s_attributes_vertical.xml
+++ b/theme_artists/views/snippets/s_attributes_vertical.xml
@@ -8,13 +8,13 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=rgba(0,0,0,.25)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=rgba(0,0,0,.25)&amp;c2=rgba(0,0,0,.5)&amp;c4=o-color-1&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_big_number.xml b/theme_artists/views/snippets/s_big_number.xml
index f29499b70..62a4c806a 100644
--- a/theme_artists/views/snippets/s_big_number.xml
+++ b/theme_artists/views/snippets/s_big_number.xml
@@ -9,7 +9,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/Airy/14_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/html_editor/shape/html_builder/Airy/14_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_artists/views/snippets/s_color_blocks_2.xml b/theme_artists/views/snippets/s_color_blocks_2.xml
index d30ce16a5..8bde77660 100644
--- a/theme_artists/views/snippets/s_color_blocks_2.xml
+++ b/theme_artists/views/snippets/s_color_blocks_2.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Left column - Shape -->
     <xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/html_editor/shape/html_builder/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Left column - Button -->
     <xpath expr="//div[hasclass('col-lg-6')]//a[hasclass('btn')]" position="attributes">
diff --git a/theme_artists/views/snippets/s_cover.xml b/theme_artists/views/snippets/s_cover.xml
index 507e3b608..c59f59565 100644
--- a/theme_artists/views/snippets/s_cover.xml
+++ b/theme_artists/views/snippets/s_cover.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Remove filter & parallax -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
diff --git a/theme_artists/views/snippets/s_features.xml b/theme_artists/views/snippets/s_features.xml
index 881354165..985b24d4d 100644
--- a/theme_artists/views/snippets/s_features.xml
+++ b/theme_artists/views/snippets/s_features.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/Airy/14_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/html_editor/shape/html_builder/Airy/14_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Feature #01 - Icon -->
     <xpath expr="//i" position="attributes">
diff --git a/theme_artists/views/snippets/s_image_text_box.xml b/theme_artists/views/snippets/s_image_text_box.xml
index 28a9cffc8..f4b6ee1d0 100644
--- a/theme_artists/views/snippets/s_image_text_box.xml
+++ b/theme_artists/views/snippets/s_image_text_box.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape': 'html_builder/Connections/08','colors':{'c5':'o-color-1'}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/08.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Text box -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_artists/views/snippets/s_key_benefits.xml b/theme_artists/views/snippets/s_key_benefits.xml
index 53a2f3eb7..37135fe31 100644
--- a/theme_artists/views/snippets/s_key_benefits.xml
+++ b/theme_artists/views/snippets/s_key_benefits.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape': 'html_builder/Connections/14','colors':{'c5':'o-color-1'}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/14.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/14.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Titles -->
     <xpath expr="(//h3)[1]" position="replace" mode="inner">
diff --git a/theme_artists/views/snippets/s_quotes_carousel_minimal.xml b/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
index 467e04c08..c1198cf7a 100644
--- a/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/17','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_artists/views/snippets/s_striped.xml b/theme_artists/views/snippets/s_striped.xml
index 4ebf01949..3cf560b32 100644
--- a/theme_artists/views/snippets/s_striped.xml
+++ b/theme_artists/views/snippets/s_striped.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_striped_center_top.xml b/theme_artists/views/snippets/s_striped_center_top.xml
index cfc92f0b2..8f50304cc 100644
--- a/theme_artists/views/snippets/s_striped_center_top.xml
+++ b/theme_artists/views/snippets/s_striped_center_top.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_artists/views/snippets/s_striped_top.xml b/theme_artists/views/snippets/s_striped_top.xml
index fbb831746..ae7d5db4c 100644
--- a/theme_artists/views/snippets/s_striped_top.xml
+++ b/theme_artists/views/snippets/s_striped_top.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="attributes">
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 530affda6..9454d41d5 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -178,7 +178,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/02","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/web_editor/shape/html_builder/Connections/02.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/html_editor/shape/html_builder/Connections/02.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_avantgarde/views/new_page_template.xml b/theme_avantgarde/views/new_page_template.xml
index c8563986e..01926b93a 100644
--- a/theme_avantgarde/views/new_page_template.xml
+++ b/theme_avantgarde/views/new_page_template.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
     </xpath>
 </template>
 
@@ -17,7 +17,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
     </xpath>
 </template>
 
@@ -26,7 +26,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06",""colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/new_page_template.xml b/theme_aviato/views/new_page_template.xml
index 3140c0955..02820e558 100644
--- a/theme_aviato/views/new_page_template.xml
+++ b/theme_aviato/views/new_page_template.xml
@@ -18,7 +18,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -66,7 +66,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -87,7 +87,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -98,7 +98,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -123,7 +123,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_accordion_image.xml b/theme_aviato/views/snippets/s_accordion_image.xml
index 7a32ebc2f..838056be3 100644
--- a/theme_aviato/views/snippets/s_accordion_image.xml
+++ b/theme_aviato/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">/web_editor/shape/theme_aviato/s_accordion_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_aviato/s_accordion_image.svg?c1=o-color-1</attribute>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_banner.xml b/theme_aviato/views/snippets/s_banner.xml
index de3fb5f94..c1b5dddd2 100644
--- a/theme_aviato/views/snippets/s_banner.xml
+++ b/theme_aviato/views/snippets/s_banner.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape": "html_builder/Connections/06", "colors": {"c5": "o-color-4"}, "flip": [], "showOnMobile": false, "shapeAnimationSpeed": "0"}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace">
diff --git a/theme_aviato/views/snippets/s_big_number.xml b/theme_aviato/views/snippets/s_big_number.xml
index 9a5fa1796..c6b36ebea 100644
--- a/theme_aviato/views/snippets/s_big_number.xml
+++ b/theme_aviato/views/snippets/s_big_number.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_aviato/views/snippets/s_cover.xml b/theme_aviato/views/snippets/s_cover.xml
index 1a97dae71..f7df56ff6 100644
--- a/theme_aviato/views/snippets/s_cover.xml
+++ b/theme_aviato/views/snippets/s_cover.xml
@@ -31,7 +31,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/html_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_image_text.xml b/theme_aviato/views/snippets/s_image_text.xml
index 88674f2f1..10ced6c3f 100644
--- a/theme_aviato/views/snippets/s_image_text.xml
+++ b/theme_aviato/views/snippets/s_image_text.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_aviato/s_image_text.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_aviato/s_image_text.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_aviato/views/snippets/s_key_images.xml b/theme_aviato/views/snippets/s_key_images.xml
index 80e83eacd..f9535d3d1 100644
--- a/theme_aviato/views/snippets/s_key_images.xml
+++ b/theme_aviato/views/snippets/s_key_images.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5": "o-color-3"},"flip":[],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_aviato/views/snippets/s_masonry_block.xml b/theme_aviato/views/snippets/s_masonry_block.xml
index b28a2c345..8fa20ad95 100644
--- a/theme_aviato/views/snippets/s_masonry_block.xml
+++ b/theme_aviato/views/snippets/s_masonry_block.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':true}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_showcase.xml b/theme_aviato/views/snippets/s_showcase.xml
index 91fdb2165..f7d3b42ec 100644
--- a/theme_aviato/views/snippets/s_showcase.xml
+++ b/theme_aviato/views/snippets/s_showcase.xml
@@ -40,7 +40,7 @@
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_aviato/s_accordion_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_aviato/s_accordion_image.svg?c1=o-color-1</attribute>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_text_image.xml b/theme_aviato/views/snippets/s_text_image.xml
index ca095d1b8..44b621af1 100644
--- a/theme_aviato/views/snippets/s_text_image.xml
+++ b/theme_aviato/views/snippets/s_text_image.xml
@@ -23,7 +23,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_aviato/s_text_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_aviato/s_text_image.svg?c1=o-color-1</attribute>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/new_page_template.xml b/theme_beauty/views/new_page_template.xml
index 5cba1fc92..027a5aafc 100644
--- a/theme_beauty/views/new_page_template.xml
+++ b/theme_beauty/views/new_page_template.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -17,7 +17,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -26,7 +26,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -35,7 +35,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -95,7 +95,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -104,7 +104,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_big_number.xml b/theme_beauty/views/snippets/s_big_number.xml
index ddf6b9578..3d92a951a 100644
--- a/theme_beauty/views/snippets/s_big_number.xml
+++ b/theme_beauty/views/snippets/s_big_number.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index 08151ce63..544964602 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -41,7 +41,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/web_editor/shape/html_builder/Connections/02.svg?c5=o-color-4&amp;flip=y');"/>
+        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/html_editor/shape/html_builder/Connections/02.svg?c5=o-color-4&amp;flip=y');"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_features_wall.xml b/theme_beauty/views/snippets/s_features_wall.xml
index 115201ef8..da32aad8d 100644
--- a/theme_beauty/views/snippets/s_features_wall.xml
+++ b/theme_beauty/views/snippets/s_features_wall.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-4','c1':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_html_builder_Grids_02')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1&amp;flip=x');"/>
     </xpath>
     <xpath expr="//img" position="attributes">
         <attribute name="class" add="rounded-circle" separator=" "/>
diff --git a/theme_beauty/views/snippets/s_numbers_boxed.xml b/theme_beauty/views/snippets/s_numbers_boxed.xml
index ffccece39..460cdb949 100644
--- a/theme_beauty/views/snippets/s_numbers_boxed.xml
+++ b/theme_beauty/views/snippets/s_numbers_boxed.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_beauty/views/snippets/s_numbers_showcase.xml b/theme_beauty/views/snippets/s_numbers_showcase.xml
index a580fda53..38e906a5e 100644
--- a/theme_beauty/views/snippets/s_numbers_showcase.xml
+++ b/theme_beauty/views/snippets/s_numbers_showcase.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1&amp;flip=x');"/>
     </xpath>
     <!-- Grid items -->
     <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
diff --git a/theme_beauty/views/snippets/s_picture.xml b/theme_beauty/views/snippets/s_picture.xml
index ecb954fea..ba859d776 100644
--- a/theme_beauty/views/snippets/s_picture.xml
+++ b/theme_beauty/views/snippets/s_picture.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Rainy_06" style="background-image: url('/web_editor/shape/html_builder/Rainy/06.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Rainy_06" style="background-image: url('/html_editor/shape/html_builder/Rainy/06.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_pricelist_boxed.xml b/theme_beauty/views/snippets/s_pricelist_boxed.xml
index 7113927d4..697fca92b 100644
--- a/theme_beauty/views/snippets/s_pricelist_boxed.xml
+++ b/theme_beauty/views/snippets/s_pricelist_boxed.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-4', 'c1':'o-color-4'},'flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div" position="attributes">
         <attribute name="class" add="o_cc2 col-lg-5 border" remove="o_cc1 offset-lg-2 col-lg-8" separator=" "/>
diff --git a/theme_beauty/views/snippets/s_title.xml b/theme_beauty/views/snippets/s_title.xml
index 1cb6fa12b..b37b02395 100644
--- a/theme_beauty/views/snippets/s_title.xml
+++ b/theme_beauty/views/snippets/s_title.xml
@@ -19,7 +19,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/html_editor/shape/html_builder/Connections/10.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_wavy_grid.xml b/theme_beauty/views/snippets/s_wavy_grid.xml
index ffbab086c..3a0691d04 100644
--- a/theme_beauty/views/snippets/s_wavy_grid.xml
+++ b/theme_beauty/views/snippets/s_wavy_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/17','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index bab1b36dd..ca18d9788 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -135,7 +135,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/05_001"}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/html_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         Faculties
@@ -219,7 +219,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -247,7 +247,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/html_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace">
@@ -528,7 +528,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/html_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
@@ -903,7 +903,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_20 bg-rgba(0,0,0,0.25)" style="background-image: url('/web_editor/shape/html_builder/Bold/20.svg?c5=o-color-4&amp;c1=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_20 bg-rgba(0,0,0,0.25)" style="background-image: url('/html_editor/shape/html_builder/Bold/20.svg?c5=o-color-4&amp;c1=o-color-4');"/>
     </xpath>
 
     <!-- Text -->
@@ -922,7 +922,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/06_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/web_editor/shape/html_builder/Airy/06_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/html_editor/shape/html_builder/Airy/06_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
@@ -1141,7 +1141,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -1154,7 +1154,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_bewise/views/new_page_template.xml b/theme_bewise/views/new_page_template.xml
index dc78f0712..a8d14a290 100644
--- a/theme_bewise/views/new_page_template.xml
+++ b/theme_bewise/views/new_page_template.xml
@@ -42,7 +42,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/html_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -92,7 +92,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/html_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/new_page_template.xml b/theme_bistro/views/new_page_template.xml
index 213f8c492..eebdccfcd 100644
--- a/theme_bistro/views/new_page_template.xml
+++ b/theme_bistro/views/new_page_template.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/26","colors":{"c5": "o-color-1"},"flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -20,7 +20,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -66,7 +66,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -77,7 +77,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -189,7 +189,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -201,7 +201,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -236,7 +236,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -308,7 +308,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_big_number.xml b/theme_bistro/views/snippets/s_big_number.xml
index 40f2853d9..497c73d9e 100644
--- a/theme_bistro/views/snippets/s_big_number.xml
+++ b/theme_bistro/views/snippets/s_big_number.xml
@@ -9,7 +9,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/web_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/html_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_bistro/views/snippets/s_cover.xml b/theme_bistro/views/snippets/s_cover.xml
index 40c058772..9c1fdbe06 100644
--- a/theme_bistro/views/snippets/s_cover.xml
+++ b/theme_bistro/views/snippets/s_cover.xml
@@ -33,7 +33,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index f903a11e7..8eb27398c 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -24,7 +24,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/html_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_quotes_carousel.xml b/theme_bistro/views/snippets/s_quotes_carousel.xml
index 83f49f7e7..909499cac 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel.xml
+++ b/theme_bistro/views/snippets/s_quotes_carousel.xml
@@ -12,7 +12,7 @@
         <attribute name="class" remove="s_carousel_indicators_dots" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_16" style="background-image: url('/web_editor/shape/html_builder/Bold/16.svg?c5=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_16" style="background-image: url('/html_editor/shape/html_builder/Bold/16.svg?c5=o-color-1&amp;flip=x');"/>
     </xpath>
     <xpath expr="//blockquote" position="attributes">
         <attribute name="class" add="s_blockquote_default" remove="s_blockquote_with_icon" separator=" "/>
diff --git a/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml b/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml
index b7ad8e5f8..d5d98789f 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bistro/views/snippets/s_wavy_grid.xml b/theme_bistro/views/snippets/s_wavy_grid.xml
index fe8570d3e..5698d7ebc 100644
--- a/theme_bistro/views/snippets/s_wavy_grid.xml
+++ b/theme_bistro/views/snippets/s_wavy_grid.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/26','colors':{'c5': 'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bookstore/views/snippets/s_banner.xml b/theme_bookstore/views/snippets/s_banner.xml
index 3b31ad055..ba45507a7 100644
--- a/theme_bookstore/views/snippets/s_banner.xml
+++ b/theme_bookstore/views/snippets/s_banner.xml
@@ -34,7 +34,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3')"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml
index b092818db..b49ef66cb 100644
--- a/theme_bookstore/views/snippets/s_cover.xml
+++ b/theme_bookstore/views/snippets/s_cover.xml
@@ -11,7 +11,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
diff --git a/theme_bookstore/views/snippets/s_cta_box.xml b/theme_bookstore/views/snippets/s_cta_box.xml
index 566128d54..923a00bd9 100644
--- a/theme_bookstore/views/snippets/s_cta_box.xml
+++ b/theme_bookstore/views/snippets/s_cta_box.xml
@@ -27,7 +27,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_media_list.xml b/theme_bookstore/views/snippets/s_media_list.xml
index efefd156d..164b0e3c9 100644
--- a/theme_bookstore/views/snippets/s_media_list.xml
+++ b/theme_bookstore/views/snippets/s_media_list.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_05" style="background-image: url('/web_editor/shape/html_builder/Bold/05.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_05" style="background-image: url('/html_editor/shape/html_builder/Bold/05.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
diff --git a/theme_bookstore/views/snippets/s_numbers.xml b/theme_bookstore/views/snippets/s_numbers.xml
index 5a52a4b11..8bfac6a50 100644
--- a/theme_bookstore/views/snippets/s_numbers.xml
+++ b/theme_bookstore/views/snippets/s_numbers.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5&amp;flip=x');"/>
     </xpath>
     <!-- Titles -->
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
diff --git a/theme_bookstore/views/snippets/s_numbers_boxed.xml b/theme_bookstore/views/snippets/s_numbers_boxed.xml
index a6bf67d8e..4799cd0a7 100644
--- a/theme_bookstore/views/snippets/s_numbers_boxed.xml
+++ b/theme_bookstore/views/snippets/s_numbers_boxed.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_bookstore/views/snippets/s_pricelist_boxed.xml b/theme_bookstore/views/snippets/s_pricelist_boxed.xml
index d3a3c14b4..740a843f4 100644
--- a/theme_bookstore/views/snippets/s_pricelist_boxed.xml
+++ b/theme_bookstore/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/13_002','colors':{'c5':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated"  style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated"  style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc1 rounded" separator=" "/>
diff --git a/theme_bookstore/views/snippets/s_title.xml b/theme_bookstore/views/snippets/s_title.xml
index 5b32c3cbe..f9100d28e 100644
--- a/theme_bookstore/views/snippets/s_title.xml
+++ b/theme_bookstore/views/snippets/s_title.xml
@@ -25,7 +25,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/html_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_wavy_grid.xml b/theme_bookstore/views/snippets/s_wavy_grid.xml
index 184e6f252..227bfbd3e 100644
--- a/theme_bookstore/views/snippets/s_wavy_grid.xml
+++ b/theme_bookstore/views/snippets/s_wavy_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/03","colors":{"c2":"o-color-3"},"flip":["x","y"],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_03" style="background-image: url('/web_editor/shape/html_builder/Blobs/03.svg?c2=o-color-3&amp;flip=xy');  background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_03" style="background-image: url('/html_editor/shape/html_builder/Blobs/03.svg?c2=o-color-3&amp;flip=xy');  background-position: 50% 100%;"/>
     </xpath>
     <xpath expr="//h3" position="attributes">
         <attribute name="class" add="h4-fs" remove="h5-fs" separator=" "/>
diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml
index dff09581c..905510506 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -55,7 +55,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blocks_04" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=rgba(0,0,0,0)&amp;c5=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Blocks_04" style="background-image: url('/html_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=rgba(0,0,0,0)&amp;c5=o-color-5');"/>
     </xpath>
 </template>
 
@@ -79,7 +79,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
@@ -107,7 +107,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -126,7 +126,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
@@ -235,7 +235,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -288,7 +288,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -307,7 +307,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_accordion_image.xml b/theme_buzzy/views/snippets/s_accordion_image.xml
index c3795ba61..13f15ed4a 100644
--- a/theme_buzzy/views/snippets/s_accordion_image.xml
+++ b/theme_buzzy/views/snippets/s_accordion_image.xml
@@ -9,7 +9,7 @@
         Top <span class="o_text_highlight o_translate_inline o_text_highlight_scribble_4 o_text_highlight_fill">questions</span> answered
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_accordion_image.svg?c1=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_accordion_image.svg?c1=o-color-2</attribute>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_banner.xml b/theme_buzzy/views/snippets/s_banner.xml
index e212b118a..83e8c1cd3 100644
--- a/theme_buzzy/views/snippets/s_banner.xml
+++ b/theme_buzzy/views/snippets/s_banner.xml
@@ -21,7 +21,7 @@
       Unleash your <strong><span class="o_text_highlight o_translate_inline o_text_highlight_scribble_3 o_text_highlight_fill">potential</span>.</strong>
    </xpath>
    <xpath expr="//div[hasclass('row')]//div[2]//img" position="attributes">
-      <attribute name="src">/web_editor/shape/theme_buzzy/s_banner_2.svg?c1=o-color-2</attribute>
+      <attribute name="src">/html_editor/shape/theme_buzzy/s_banner_2.svg?c1=o-color-2</attribute>
    </xpath>
    <xpath expr="//div[hasclass('row')]//div[3]" position="replace"/>
    <xpath expr="//div[hasclass('row')]//div[3]" position="replace"/>
diff --git a/theme_buzzy/views/snippets/s_color_blocks_2.xml b/theme_buzzy/views/snippets/s_color_blocks_2.xml
index 19f8002bc..797602564 100644
--- a/theme_buzzy/views/snippets/s_color_blocks_2.xml
+++ b/theme_buzzy/views/snippets/s_color_blocks_2.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Left block - Shape -->
     <xpath expr="//div[hasclass('row')]//div//h2" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Right block -->
     <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Right block - Shape -->
     <xpath expr="//div[hasclass('row')]//div[2]//h2" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_cover.xml b/theme_buzzy/views/snippets/s_cover.xml
index e6bec3f6c..3f5b9a564 100644
--- a/theme_buzzy/views/snippets/s_cover.xml
+++ b/theme_buzzy/views/snippets/s_cover.xml
@@ -13,7 +13,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=rgba(255,255,255,0.25)&amp;c3=rgba(255,255,255,0)');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=rgba(255,255,255,0.25)&amp;c3=rgba(255,255,255,0)');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_buzzy/views/snippets/s_cta_box.xml b/theme_buzzy/views/snippets/s_cta_box.xml
index 3584f33e3..e2058f634 100644
--- a/theme_buzzy/views/snippets/s_cta_box.xml
+++ b/theme_buzzy/views/snippets/s_cta_box.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/02','colors':{'c1':'o-color-1','c2':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('card-body')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/web_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/html_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-5');"/>
     </xpath>
     <xpath expr="//div[hasclass('card-body')]" position="attributes">
         <attribute name="style">text-align: center;</attribute>
@@ -34,7 +34,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/10_002','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_10_002" style="background-image: url('/web_editor/shape/html_builder/Blobs/10_002.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_10_002" style="background-image: url('/html_editor/shape/html_builder/Blobs/10_002.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_discovery.xml b/theme_buzzy/views/snippets/s_discovery.xml
index 8c49be4ca..3a9232036 100644
--- a/theme_buzzy/views/snippets/s_discovery.xml
+++ b/theme_buzzy/views/snippets/s_discovery.xml
@@ -7,7 +7,7 @@
       <attribute name="data-oe-shape-data">{'shape':'html_builder/Containers/06','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
    </xpath>
    <xpath expr="//div[hasclass('container')]" position="before">
-      <div class="o_we_shape o_html_builder_Containers_06 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Containers/06.svg?c5=o-color-4');"/>
+      <div class="o_we_shape o_html_builder_Containers_06 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Containers/06.svg?c5=o-color-4');"/>
    </xpath>
    <xpath expr="//h1" position="replace">
       <h2 class="display-4-fs" style="text-align: center;"><span style="font-weight: normal;">Discover our solutions</span></h2>
diff --git a/theme_buzzy/views/snippets/s_image_text.xml b/theme_buzzy/views/snippets/s_image_text.xml
index 4acfd6662..9788d1da3 100644
--- a/theme_buzzy/views/snippets/s_image_text.xml
+++ b/theme_buzzy/views/snippets/s_image_text.xml
@@ -13,7 +13,7 @@
     <xpath expr="//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_image_text.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_image_text.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Paragraphs -->
     <xpath expr="//p[2]" position="replace" mode="inner">
diff --git a/theme_buzzy/views/snippets/s_image_title.xml b/theme_buzzy/views/snippets/s_image_title.xml
index 82658690b..ce18582c9 100644
--- a/theme_buzzy/views/snippets/s_image_title.xml
+++ b/theme_buzzy/views/snippets/s_image_title.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/04_001','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/04_001.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/html_editor/shape/html_builder/Blobs/04_001.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
diff --git a/theme_buzzy/views/snippets/s_key_images.xml b/theme_buzzy/views/snippets/s_key_images.xml
index 65c95b500..99a47aef4 100644
--- a/theme_buzzy/views/snippets/s_key_images.xml
+++ b/theme_buzzy/views/snippets/s_key_images.xml
@@ -4,16 +4,16 @@
 <template id="s_key_images" inherit_id="website.s_key_images">
     <!-- Layout -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_accordion_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_accordion_image.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_banner.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_banner.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_media_list-03.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_media_list-03.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_three_columns-01.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_three_columns-01.svg?c1=o-color-1</attribute>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_buzzy/views/snippets/s_media_list.xml b/theme_buzzy/views/snippets/s_media_list.xml
index 095e12a47..47224ca2e 100644
--- a/theme_buzzy/views/snippets/s_media_list.xml
+++ b/theme_buzzy/views/snippets/s_media_list.xml
@@ -10,7 +10,7 @@
     <xpath expr="//div[hasclass('s_media_list_item')]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_media_list-01.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_media_list-01.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Media item #2 -->
     <xpath expr="//div[hasclass('s_media_list_item')][2]/div" position="attributes">
@@ -20,7 +20,7 @@
     <xpath expr="//div[hasclass('s_media_list_item')][2]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_media_list-02.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_media_list-02.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Media item #3 -->
     <xpath expr="//div[hasclass('s_media_list_item')][3]/div" position="attributes">
@@ -30,7 +30,7 @@
     <xpath expr="//div[hasclass('s_media_list_item')][3]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_media_list-03.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_media_list-03.svg?c1=o-color-1</attribute>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_pricelist_boxed.xml b/theme_buzzy/views/snippets/s_pricelist_boxed.xml
index 01542437d..33c39cdee 100644
--- a/theme_buzzy/views/snippets/s_pricelist_boxed.xml
+++ b/theme_buzzy/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_buzzy/views/snippets/s_product_catalog.xml b/theme_buzzy/views/snippets/s_product_catalog.xml
index 48941e8a7..bcf218200 100644
--- a/theme_buzzy/views/snippets/s_product_catalog.xml
+++ b/theme_buzzy/views/snippets/s_product_catalog.xml
@@ -10,7 +10,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/web_editor/shape/html_builder/Airy/07_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/html_editor/shape/html_builder/Airy/07_001.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_showcase.xml b/theme_buzzy/views/snippets/s_showcase.xml
index 58489c1aa..14c38fdac 100644
--- a/theme_buzzy/views/snippets/s_showcase.xml
+++ b/theme_buzzy/views/snippets/s_showcase.xml
@@ -3,7 +3,7 @@
 
 <template id="s_showcase" inherit_id="website.s_showcase">
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_showcase.svg?c1=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_showcase.svg?c1=o-color-2</attribute>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Features <span class="o_text_highlight o_translate_inline o_text_highlight_scribble_3 o_text_highlight_fill">showcase</span>
diff --git a/theme_buzzy/views/snippets/s_text_image.xml b/theme_buzzy/views/snippets/s_text_image.xml
index 4b63a2594..e4de58c5d 100644
--- a/theme_buzzy/views/snippets/s_text_image.xml
+++ b/theme_buzzy/views/snippets/s_text_image.xml
@@ -17,7 +17,7 @@
     <xpath expr="//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_text_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_text_image.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Paragraphs -->
     <xpath expr="//p[2]" position="replace" mode="inner">
diff --git a/theme_buzzy/views/snippets/s_three_columns.xml b/theme_buzzy/views/snippets/s_three_columns.xml
index 57e3f57f3..4d18eb232 100644
--- a/theme_buzzy/views/snippets/s_three_columns.xml
+++ b/theme_buzzy/views/snippets/s_three_columns.xml
@@ -10,7 +10,7 @@
     <xpath expr="//div[hasclass('card')]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_three_columns-01.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_three_columns-01.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//div[hasclass('card')]//h2" position="replace" mode="inner">
@@ -29,7 +29,7 @@
     <xpath expr="(//div[hasclass('card')])[2]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_three_columns-02.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_three_columns-02.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="(//div[hasclass('card')])[2]//h2" position="replace" mode="inner">
@@ -48,7 +48,7 @@
     <xpath expr="(//div[hasclass('card')])[3]//img" position="attributes">
         <attribute name="style">padding: 32px !important;</attribute>
         <!-- Enable SVG dynamic color functionality -->
-        <attribute name="src">/web_editor/shape/theme_buzzy/s_three_columns-03.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_buzzy/s_three_columns-03.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="(//div[hasclass('card')])[3]//h2" position="replace" mode="inner">
@@ -67,7 +67,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/new_page_template.xml b/theme_clean/views/new_page_template.xml
index 547d81cf8..7a9bd096b 100644
--- a/theme_clean/views/new_page_template.xml
+++ b/theme_clean/views/new_page_template.xml
@@ -10,7 +10,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -27,7 +27,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
 </template>
 
@@ -43,7 +43,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -109,7 +109,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -135,7 +135,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -169,7 +169,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_numbers.xml b/theme_clean/views/snippets/s_numbers.xml
index 4c14e34e6..c22edd6aa 100644
--- a/theme_clean/views/snippets/s_numbers.xml
+++ b/theme_clean/views/snippets/s_numbers.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_numbers_showcase.xml b/theme_clean/views/snippets/s_numbers_showcase.xml
index 5af1f75eb..ceb8e2e30 100644
--- a/theme_clean/views/snippets/s_numbers_showcase.xml
+++ b/theme_clean/views/snippets/s_numbers_showcase.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Grid items -->
     <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
diff --git a/theme_clean/views/snippets/s_pricelist_boxed.xml b/theme_clean/views/snippets/s_pricelist_boxed.xml
index 3dc191155..6a8b24225 100644
--- a/theme_clean/views/snippets/s_pricelist_boxed.xml
+++ b/theme_clean/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y');  background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y');  background-position: 50% 0%"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_clean/views/snippets/s_three_columns.xml b/theme_clean/views/snippets/s_three_columns.xml
index e414d460c..38098c727 100644
--- a/theme_clean/views/snippets/s_three_columns.xml
+++ b/theme_clean/views/snippets/s_three_columns.xml
@@ -45,7 +45,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index f2180d5a5..629adeef2 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-3');"/>
     </xpath>
     <!-- Row - remove grid mode -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -28,7 +28,7 @@
     <!-- Image -->
     <xpath expr="//div[hasclass('col-lg-5')]" position="after">
         <div class="col-lg-7 d-lg-block d-none o_snippet_mobile_invisible">
-            <img src="/web_editor/shape/theme_cobalt/s_banner_2.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt=""/>
+            <img src="/html_editor/shape/theme_cobalt/s_banner_2.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt=""/>
         </div>
     </xpath>
     <!-- Content -->
@@ -55,7 +55,7 @@
         <attribute name="class" add="pt24 pb24" remove="pt16 pb16" separator=" "/>
     </xpath>
     <xpath expr="//img" position="replace">
-        <img src="/web_editor/shape/theme_cobalt/s_image_text_2.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt="Marketing"/>
+        <img src="/html_editor/shape/theme_cobalt/s_image_text_2.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt="Marketing"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//h2" position="replace">
@@ -80,7 +80,7 @@
         <h2>Unlock the possibilities of what we can offer you</h2>
     </xpath>
     <xpath expr="//img" position="replace">
-        <img src="/web_editor/shape/theme_cobalt/s_text_image.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt="Marketing"/>
+        <img src="/html_editor/shape/theme_cobalt/s_text_image.svg?c1=o-color-1" class="img img-fluid mx-auto" style="width: 100%;" alt="Marketing"/>
     </xpath>
     <xpath expr="//p" position="replace"/>
     <xpath expr="//p" position="replace">
@@ -348,7 +348,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
@@ -460,7 +460,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/10_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
@@ -473,7 +473,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 
     <!-- Numbers -->
@@ -528,16 +528,16 @@
 
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_cobalt/s_key_images_1.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_cobalt/s_key_images_1.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_cobalt/s_key_images_2.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_cobalt/s_key_images_2.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_cobalt/s_key_images_3.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_cobalt/s_key_images_3.svg?c1=o-color-1</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_cobalt/s_key_images_4.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_cobalt/s_key_images_4.svg?c1=o-color-1</attribute>
     </xpath>
 
     <!-- Move texts before images -->
@@ -588,7 +588,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 <!-- ======== CARD OFFSET ======== -->
@@ -679,7 +679,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/05','colors':{'c5':'o-color-4'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/html_editor/shape/html_builder/Connections/05.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
         <attribute name="class" add="col-lg-3" remove="col-lg-4" separator=" "/>
@@ -704,7 +704,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/new_page_template.xml b/theme_cobalt/views/new_page_template.xml
index a656369b6..32b3a2474 100644
--- a/theme_cobalt/views/new_page_template.xml
+++ b/theme_cobalt/views/new_page_template.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/01_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -19,7 +19,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/01_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -32,7 +32,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/01_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
@@ -50,7 +50,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/html_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -59,7 +59,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/01_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
@@ -101,7 +101,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/html_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_enark/views/snippets/s_freegrid.xml b/theme_enark/views/snippets/s_freegrid.xml
index 15464dbfc..fbf55372c 100644
--- a/theme_enark/views/snippets/s_freegrid.xml
+++ b/theme_enark/views/snippets/s_freegrid.xml
@@ -11,7 +11,7 @@
         <attribute name="data-row-count">17</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container-fluid')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('container-fluid')]" position="attributes">
         <attribute name="class" add="container" remove="container-fluid" separator=" "/>
diff --git a/theme_enark/views/snippets/s_wavy_grid.xml b/theme_enark/views/snippets/s_wavy_grid.xml
index 888e5ffac..d6b1a6288 100644
--- a/theme_enark/views/snippets/s_wavy_grid.xml
+++ b/theme_enark/views/snippets/s_wavy_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/02_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/html_editor/shape/html_builder/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index ba701849e..ef128454b 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -34,7 +34,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5": "o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-7')]" position="attributes">
         <attribute name="class" add="pb128" separator=" "/>
@@ -84,7 +84,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -130,7 +130,7 @@
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -318,7 +318,7 @@
     <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/13','colors':{'c5':'o-color-3'},'flip':['x','y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -427,7 +427,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/11_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/web_editor/shape/html_builder/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/html_editor/shape/html_builder/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" remove="rounded" separator=" "/>
@@ -537,7 +537,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0;"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_graphene/views/new_page_template.xml b/theme_graphene/views/new_page_template.xml
index aa2ed8f04..6144f107f 100644
--- a/theme_graphene/views/new_page_template.xml
+++ b/theme_graphene/views/new_page_template.xml
@@ -16,7 +16,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 
@@ -47,7 +47,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -56,7 +56,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -126,7 +126,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-3"},"flip":["x","y"]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -141,7 +141,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -152,7 +152,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -171,7 +171,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -180,7 +180,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/new_page_template.xml b/theme_kea/views/new_page_template.xml
index c414191b3..f4c8a6f9f 100644
--- a/theme_kea/views/new_page_template.xml
+++ b/theme_kea/views/new_page_template.xml
@@ -16,7 +16,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 
@@ -42,7 +42,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/html_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -67,7 +67,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/html_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -92,7 +92,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -103,7 +103,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/html_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -126,7 +126,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -155,7 +155,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -176,7 +176,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -227,7 +227,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_accordion_image.xml b/theme_kea/views/snippets/s_accordion_image.xml
index 808b6a8ce..e954d7b9c 100644
--- a/theme_kea/views/snippets/s_accordion_image.xml
+++ b/theme_kea/views/snippets/s_accordion_image.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/10','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/html_editor/shape/html_builder/Connections/10.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_cards_grid.xml b/theme_kea/views/snippets/s_cards_grid.xml
index 6fbbf5ca0..5a4d5956a 100644
--- a/theme_kea/views/snippets/s_cards_grid.xml
+++ b/theme_kea/views/snippets/s_cards_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_kea/views/snippets/s_cover.xml b/theme_kea/views/snippets/s_cover.xml
index 8cd076aed..d42eeccaf 100644
--- a/theme_kea/views/snippets/s_cover.xml
+++ b/theme_kea/views/snippets/s_cover.xml
@@ -10,7 +10,7 @@
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_html_builder_Floats_02" style="background-image: url('/web_editor/shape/html_builder/Floats/02.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-5&amp;c4=o-color-1&amp;c5=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Floats_02" style="background-image: url('/html_editor/shape/html_builder/Floats/02.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-5&amp;c4=o-color-1&amp;c5=o-color-5');"/>
     </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
diff --git a/theme_kea/views/snippets/s_image_text.xml b/theme_kea/views/snippets/s_image_text.xml
index 2db9182f0..cfdbfa114 100644
--- a/theme_kea/views/snippets/s_image_text.xml
+++ b/theme_kea/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kea/s_image_text.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_kea/s_image_text.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -20,7 +20,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_picture.xml b/theme_kea/views/snippets/s_picture.xml
index 1d9124429..f1518b704 100644
--- a/theme_kea/views/snippets/s_picture.xml
+++ b/theme_kea/views/snippets/s_picture.xml
@@ -36,7 +36,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/html_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_pricelist_boxed.xml b/theme_kea/views/snippets/s_pricelist_boxed.xml
index 2847df430..ad20f76c2 100644
--- a/theme_kea/views/snippets/s_pricelist_boxed.xml
+++ b/theme_kea/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/01','colors':{'c1':'o-color-1','c2':'o-color-1','c3':'o-color-1','c4':'o-color-1','c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Floats_01 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Floats/01.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-1&amp;c4=o-color-1&amp;c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Floats_01 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Floats/01.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-1&amp;c4=o-color-1&amp;c5=o-color-1');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_kea/views/snippets/s_text_image.xml b/theme_kea/views/snippets/s_text_image.xml
index 0e1683e2a..b35695e08 100644
--- a/theme_kea/views/snippets/s_text_image.xml
+++ b/theme_kea/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">/web_editor/shape/theme_kea/s_text_image.svg?c1=o-color-1</attribute>
+        <attribute name="src">/html_editor/shape/theme_kea/s_text_image.svg?c1=o-color-1</attribute>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -23,7 +23,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_wavy_grid.xml b/theme_kea/views/snippets/s_wavy_grid.xml
index 3132261ba..fe39efc09 100644
--- a/theme_kea/views/snippets/s_wavy_grid.xml
+++ b/theme_kea/views/snippets/s_wavy_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kiddo/views/new_page_template.xml b/theme_kiddo/views/new_page_template.xml
index 5ac2691f4..a3924f1dd 100644
--- a/theme_kiddo/views/new_page_template.xml
+++ b/theme_kiddo/views/new_page_template.xml
@@ -20,7 +20,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/html_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -44,7 +44,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/html_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -72,7 +72,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -91,7 +91,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/html_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -108,7 +108,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -166,7 +166,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -184,7 +184,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -195,7 +195,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -224,7 +224,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -357,7 +357,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_banner.xml b/theme_kiddo/views/snippets/s_banner.xml
index 3b8bd7b3d..c237a2ad5 100644
--- a/theme_kiddo/views/snippets/s_banner.xml
+++ b/theme_kiddo/views/snippets/s_banner.xml
@@ -27,7 +27,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_html_builder_Wavy_22_001 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 
     <!-- Paragraph -->
@@ -53,7 +53,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_company_team_shapes.xml b/theme_kiddo/views/snippets/s_company_team_shapes.xml
index bdab2bb13..1ed6e919c 100644
--- a/theme_kiddo/views/snippets/s_company_team_shapes.xml
+++ b/theme_kiddo/views/snippets/s_company_team_shapes.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/10','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/html_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
index 6d6b2920b..6d3b55477 100644
--- a/theme_kiddo/views/snippets/s_image_text.xml
+++ b/theme_kiddo/views/snippets/s_image_text.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/html_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Title & Paragraphs -->
diff --git a/theme_kiddo/views/snippets/s_product_list.xml b/theme_kiddo/views/snippets/s_product_list.xml
index 2c09a5383..d3573e2d6 100644
--- a/theme_kiddo/views/snippets/s_product_list.xml
+++ b/theme_kiddo/views/snippets/s_product_list.xml
@@ -24,7 +24,7 @@
     </xpath>
     <!-- Item n°1 : SVG with dynamic color -->
     <xpath expr="//div[hasclass('col-lg-2')]//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kiddo/s_product_list_1.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_kiddo/s_product_list_1.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     
     <!-- Item n°2 -->
@@ -36,7 +36,7 @@
     </xpath>
     <!-- Item n°2 : SVG with dynamic color -->
     <xpath expr="(//div[hasclass('col-lg-2')])[2]//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kiddo/s_product_list_2.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_kiddo/s_product_list_2.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     
     <!-- Item n°3 -->
@@ -48,7 +48,7 @@
     </xpath>
     <!-- Item n°3 : SVG with dynamic color -->
     <xpath expr="(//div[hasclass('col-lg-2')])[3]//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kiddo/s_product_list_3.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_kiddo/s_product_list_3.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     
     <!-- Item n°4 -->
@@ -60,7 +60,7 @@
     </xpath>
     <!-- Item n°4 : SVG with dynamic color -->
     <xpath expr="(//div[hasclass('col-lg-2')])[4]//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kiddo/s_product_list_4.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_kiddo/s_product_list_4.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     
     <!-- Item n°5 -->
@@ -72,7 +72,7 @@
     </xpath>
     <!-- Item n°5 : SVG with dynamic color -->
     <xpath expr="(//div[hasclass('col-lg-2')])[5]//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_kiddo/s_product_list_6.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_kiddo/s_product_list_6.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     
     <!-- Remove last item -->
diff --git a/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml b/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
index b0011b517..a7e0c99bb 100644
--- a/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/22_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kiddo/views/snippets/s_text_image.xml b/theme_kiddo/views/snippets/s_text_image.xml
index 0f7e8b237..29a37e2f1 100644
--- a/theme_kiddo/views/snippets/s_text_image.xml
+++ b/theme_kiddo/views/snippets/s_text_image.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/html_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Separator -->
diff --git a/theme_kiddo/views/snippets/s_three_columns.xml b/theme_kiddo/views/snippets/s_three_columns.xml
index 647df5748..22862c7d2 100644
--- a/theme_kiddo/views/snippets/s_three_columns.xml
+++ b/theme_kiddo/views/snippets/s_three_columns.xml
@@ -127,7 +127,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/new_page_template.xml b/theme_loftspace/views/new_page_template.xml
index 63c7e186b..8c0267dfa 100644
--- a/theme_loftspace/views/new_page_template.xml
+++ b/theme_loftspace/views/new_page_template.xml
@@ -47,7 +47,7 @@
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
@@ -58,7 +58,7 @@
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
@@ -69,7 +69,7 @@
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
@@ -80,7 +80,7 @@
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_big_number.xml b/theme_loftspace/views/snippets/s_big_number.xml
index c3c6c6707..14af0f373 100644
--- a/theme_loftspace/views/snippets/s_big_number.xml
+++ b/theme_loftspace/views/snippets/s_big_number.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_loftspace/views/snippets/s_color_blocks_2.xml b/theme_loftspace/views/snippets/s_color_blocks_2.xml
index 387ede3c3..4a4779881 100644
--- a/theme_loftspace/views/snippets/s_color_blocks_2.xml
+++ b/theme_loftspace/views/snippets/s_color_blocks_2.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[]}</attribute>
     </xpath>
     <xpath expr="//h2" position="before">
-        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/html_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Right column -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -16,7 +16,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':['x']}</attribute>
     </xpath>
     <xpath expr="(//h2)[2]" position="before">
-        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 0% 50%;"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/html_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 0% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_company_team_shapes.xml b/theme_loftspace/views/snippets/s_company_team_shapes.xml
index d6e459a34..c28f8ebab 100644
--- a/theme_loftspace/views/snippets/s_company_team_shapes.xml
+++ b/theme_loftspace/views/snippets/s_company_team_shapes.xml
@@ -6,7 +6,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/12_002','colors':{'c5':'o-color-1','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_image_text.xml b/theme_loftspace/views/snippets/s_image_text.xml
index a3222f18d..4df63573d 100644
--- a/theme_loftspace/views/snippets/s_image_text.xml
+++ b/theme_loftspace/views/snippets/s_image_text.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
diff --git a/theme_loftspace/views/snippets/s_numbers.xml b/theme_loftspace/views/snippets/s_numbers.xml
index c9ac94f3c..742daa694 100644
--- a/theme_loftspace/views/snippets/s_numbers.xml
+++ b/theme_loftspace/views/snippets/s_numbers.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_text_image.xml b/theme_loftspace/views/snippets/s_text_image.xml
index 1349b7dd1..80336cbd4 100644
--- a/theme_loftspace/views/snippets/s_text_image.xml
+++ b/theme_loftspace/views/snippets/s_text_image.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
diff --git a/theme_loftspace/views/snippets/s_wavy_grid.xml b/theme_loftspace/views/snippets/s_wavy_grid.xml
index df105a502..ef94fbaae 100644
--- a/theme_loftspace/views/snippets/s_wavy_grid.xml
+++ b/theme_loftspace/views/snippets/s_wavy_grid.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/10_001','colors':{'c5':'o-color-1'},'flip':["y"],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/html_editor/shape/html_builder/Airy/10_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index d8ef9dbeb..8028c00e9 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -16,7 +16,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/14","colors":{"c5":"o-color-1","c1":"o-color-5"},"flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-5&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-5&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -247,7 +247,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/08_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
         <attribute name="class" remove="o_cc o_cc1" separator=" "/>
@@ -368,7 +368,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/14","colors":{"c5":"o-color-4","c1":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
     </xpath>
 </template>
 
@@ -666,7 +666,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
     <xpath expr="//h1" position="replace" mode="inner">
@@ -684,7 +684,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/18','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_18" style="background-image: url('/web_editor/shape/html_builder/Bold/18.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_18" style="background-image: url('/html_editor/shape/html_builder/Bold/18.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_monglia/views/new_page_template.xml b/theme_monglia/views/new_page_template.xml
index ee0d69d7e..b7059b44a 100644
--- a/theme_monglia/views/new_page_template.xml
+++ b/theme_monglia/views/new_page_template.xml
@@ -87,7 +87,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/html_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -113,7 +113,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/html_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -172,7 +172,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/html_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -208,7 +208,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/html_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/new_page_template.xml b/theme_nano/views/new_page_template.xml
index 7058cd210..30fe7cb57 100644
--- a/theme_nano/views/new_page_template.xml
+++ b/theme_nano/views/new_page_template.xml
@@ -89,7 +89,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -231,7 +231,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -242,7 +242,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -264,7 +264,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -283,7 +283,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -347,7 +347,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/html_editor/shape/html_builder/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/snippets/s_attributes_horizontal.xml b/theme_nano/views/snippets/s_attributes_horizontal.xml
index e78132a5a..1c49201b9 100644
--- a/theme_nano/views/snippets/s_attributes_horizontal.xml
+++ b/theme_nano/views/snippets/s_attributes_horizontal.xml
@@ -8,16 +8,16 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_2.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_2.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/snippets/s_attributes_vertical.xml b/theme_nano/views/snippets/s_attributes_vertical.xml
index aa227d769..77e1f950b 100644
--- a/theme_nano/views/snippets/s_attributes_vertical.xml
+++ b/theme_nano/views/snippets/s_attributes_vertical.xml
@@ -8,13 +8,13 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/snippets/s_big_number.xml b/theme_nano/views/snippets/s_big_number.xml
index ad631810a..53d9af4b5 100644
--- a/theme_nano/views/snippets/s_big_number.xml
+++ b/theme_nano/views/snippets/s_big_number.xml
@@ -9,7 +9,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_20" style="background-image: url('/web_editor/shape/html_builder/Bold/20.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_20" style="background-image: url('/html_editor/shape/html_builder/Bold/20.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_notes/views/new_page_template.xml b/theme_notes/views/new_page_template.xml
index b97c06426..0aa62497b 100644
--- a/theme_notes/views/new_page_template.xml
+++ b/theme_notes/views/new_page_template.xml
@@ -18,7 +18,7 @@
     </xpath>
     <!-- Slide #1 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/html_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Slide #2 - Shape option -->
     <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
@@ -26,7 +26,7 @@
     </xpath>
     <!-- Slide #2 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/html_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Slide #3 - Shape option -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
@@ -34,7 +34,7 @@
     </xpath>
     <!-- Slide #3 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/html_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_banner.xml b/theme_notes/views/snippets/s_banner.xml
index 48611189b..da0fb5035 100644
--- a/theme_notes/views/snippets/s_banner.xml
+++ b/theme_notes/views/snippets/s_banner.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Floats_08" style="background-image: url('/web_editor/shape/html_builder/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
+        <div class="o_we_shape o_html_builder_Floats_08" style="background-image: url('/html_editor/shape/html_builder/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_notes/views/snippets/s_big_number.xml b/theme_notes/views/snippets/s_big_number.xml
index 5583eb82f..433f9edc0 100644
--- a/theme_notes/views/snippets/s_big_number.xml
+++ b/theme_notes/views/snippets/s_big_number.xml
@@ -10,7 +10,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/04_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/html_editor/shape/html_builder/Blobs/04_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_notes/views/snippets/s_company_team.xml b/theme_notes/views/snippets/s_company_team.xml
index 755f00c15..641fbcf0a 100644
--- a/theme_notes/views/snippets/s_company_team.xml
+++ b/theme_notes/views/snippets/s_company_team.xml
@@ -47,7 +47,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/html_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_company_team_shapes.xml b/theme_notes/views/snippets/s_company_team_shapes.xml
index 70f20e8c1..b5e032d67 100644
--- a/theme_notes/views/snippets/s_company_team_shapes.xml
+++ b/theme_notes/views/snippets/s_company_team_shapes.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/15','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-1');"></div>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-1');"></div>
     </xpath>
     <xpath expr="//h2" position="replace">
             <h2 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_underline" style="--text-highlight-width: 4px; --text-highlight-color: var(--o-color-4);">Meet The Band</span></h2>
diff --git a/theme_notes/views/snippets/s_image_gallery.xml b/theme_notes/views/snippets/s_image_gallery.xml
index f00ace054..1833e02b2 100644
--- a/theme_notes/views/snippets/s_image_gallery.xml
+++ b/theme_notes/views/snippets/s_image_gallery.xml
@@ -14,7 +14,7 @@
         <attribute name="data-oe-shape-data" add="{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'showOnMobile':false,'shapeAnimationSpeed':'0'}"/>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/." position="before">
         <div class="col-lg-12">
diff --git a/theme_notes/views/snippets/s_image_text.xml b/theme_notes/views/snippets/s_image_text.xml
index 40d4147fd..f7b03518e 100644
--- a/theme_notes/views/snippets/s_image_text.xml
+++ b/theme_notes/views/snippets/s_image_text.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/13','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Text wrapper -->
     <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
diff --git a/theme_notes/views/snippets/s_key_images.xml b/theme_notes/views/snippets/s_key_images.xml
index 66b79eca8..33c9da616 100644
--- a/theme_notes/views/snippets/s_key_images.xml
+++ b/theme_notes/views/snippets/s_key_images.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/11_001","colors":{"c5":"o-color-1"},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_notes/views/snippets/s_pricelist_cafe.xml b/theme_notes/views/snippets/s_pricelist_cafe.xml
index 2b853d680..bdb34f591 100644
--- a/theme_notes/views/snippets/s_pricelist_cafe.xml
+++ b/theme_notes/views/snippets/s_pricelist_cafe.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Bold/16.svg?c5=o-color-2');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Bold/16.svg?c5=o-color-2');</attribute>
     </xpath>
     <!-- Col colors -->
     <xpath expr="//div[hasclass('o_cc5')]" position="attributes">
diff --git a/theme_notes/views/snippets/s_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
index f254b1d3d..6075efc94 100644
--- a/theme_notes/views/snippets/s_product_catalog.xml
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -12,7 +12,7 @@
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/html_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2');"/>
     </xpath>
     <!-- Title & subtitles -->
     <xpath expr="//h2" position="replace">
diff --git a/theme_notes/views/snippets/s_quotes_carousel_minimal.xml b/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
index 29db831a1..b499c75b9 100644
--- a/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/13_002','colors':{'c5':'o-color-3','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-3&amp;c3=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated" style="background-image: url('/html_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-3&amp;c3=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_notes/views/snippets/s_text_image.xml b/theme_notes/views/snippets/s_text_image.xml
index 06330f4bf..fea54fa72 100644
--- a/theme_notes/views/snippets/s_text_image.xml
+++ b/theme_notes/views/snippets/s_text_image.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/11_001","colors":{"c5":"o-color-1"},"flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_notes/views/snippets/s_title.xml b/theme_notes/views/snippets/s_title.xml
index 6f31b7900..cc2f084ae 100644
--- a/theme_notes/views/snippets/s_title.xml
+++ b/theme_notes/views/snippets/s_title.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/15','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15 bg-o-color-1" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-4');"></div>
+        <div class="o_we_shape o_html_builder_Bold_15 bg-o-color-1" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-4');"></div>
     </xpath>
     <xpath expr="//h2" position="replace">
         <h2 style="text-align: center;">#PulseOfTheFuture</h2>
diff --git a/theme_notes/views/snippets/s_wavy_grid.xml b/theme_notes/views/snippets/s_wavy_grid.xml
index f1377cfad..bcbf26ce9 100644
--- a/theme_notes/views/snippets/s_wavy_grid.xml
+++ b/theme_notes/views/snippets/s_wavy_grid.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/10','colors':{'c1':'o-color-1','c2':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-1&amp;c2=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/html_editor/shape/html_builder/Wavy/10.svg?c1=o-color-1&amp;c2=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_odoo_experts/views/new_page_template.xml b/theme_odoo_experts/views/new_page_template.xml
index 712665b1f..5b700e81f 100644
--- a/theme_odoo_experts/views/new_page_template.xml
+++ b/theme_odoo_experts/views/new_page_template.xml
@@ -29,7 +29,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/Containers/05.svg?c5=o-color-4')"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/html_editor/shape/html_builder/Containers/05.svg?c5=o-color-4')"/>
     </xpath>
 </template>
 
@@ -49,7 +49,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -82,7 +82,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -109,7 +109,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_cta_box.xml b/theme_odoo_experts/views/snippets/s_cta_box.xml
index 5ee09b1e6..0ad7ed3aa 100644
--- a/theme_odoo_experts/views/snippets/s_cta_box.xml
+++ b/theme_odoo_experts/views/snippets/s_cta_box.xml
@@ -8,7 +8,7 @@
     </xpath>
 
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Card -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
diff --git a/theme_odoo_experts/views/snippets/s_image_title.xml b/theme_odoo_experts/views/snippets/s_image_title.xml
index d8f1c9213..e4f34a197 100644
--- a/theme_odoo_experts/views/snippets/s_image_title.xml
+++ b/theme_odoo_experts/views/snippets/s_image_title.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/26','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-3');"></div>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-3');"></div>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
diff --git a/theme_odoo_experts/views/snippets/s_key_images.xml b/theme_odoo_experts/views/snippets/s_key_images.xml
index 5577e311c..efda6ff3b 100644
--- a/theme_odoo_experts/views/snippets/s_key_images.xml
+++ b/theme_odoo_experts/views/snippets/s_key_images.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_odoo_experts/views/snippets/s_numbers.xml b/theme_odoo_experts/views/snippets/s_numbers.xml
index 9def5461c..d4bfef1c9 100644
--- a/theme_odoo_experts/views/snippets/s_numbers.xml
+++ b/theme_odoo_experts/views/snippets/s_numbers.xml
@@ -5,7 +5,7 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt200 pb200 oe_img_bg o_bg_img_center o_cc4" remove="pt80 pb80 o_cc1" separator=" "/>
-        <attribute name="style">background-image:url('/web_editor/shape/theme_odoo_experts/s_numbers.svg?c1=o-color-1');</attribute>
+        <attribute name="style">background-image:url('/html_editor/shape/theme_odoo_experts/s_numbers.svg?c1=o-color-1');</attribute>
     </xpath>
     <!-- Numbers -->
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
diff --git a/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml b/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml
index 558608770..a9e67cde1 100644
--- a/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml
+++ b/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_odoo_experts/views/snippets/s_product_catalog.xml b/theme_odoo_experts/views/snippets/s_product_catalog.xml
index 2d7baeca1..b9a8f51cc 100644
--- a/theme_odoo_experts/views/snippets/s_product_catalog.xml
+++ b/theme_odoo_experts/views/snippets/s_product_catalog.xml
@@ -10,7 +10,7 @@
     <!-- Filter & shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=rgba(255,255,255,0)');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=rgba(255,255,255,0)');"/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_wavy_grid.xml b/theme_odoo_experts/views/snippets/s_wavy_grid.xml
index 713aa3e41..cd1338669 100644
--- a/theme_odoo_experts/views/snippets/s_wavy_grid.xml
+++ b/theme_odoo_experts/views/snippets/s_wavy_grid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5':'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/new_page_template.xml b/theme_orchid/views/new_page_template.xml
index 083433290..9061a1d96 100644
--- a/theme_orchid/views/new_page_template.xml
+++ b/theme_orchid/views/new_page_template.xml
@@ -46,7 +46,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -59,7 +59,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -72,7 +72,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -83,7 +83,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -94,7 +94,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -112,7 +112,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -185,7 +185,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -202,7 +202,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -219,7 +219,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -239,7 +239,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -250,7 +250,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -269,7 +269,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -288,7 +288,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/html_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -299,7 +299,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/html_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -334,7 +334,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_attributes_horizontal.xml b/theme_orchid/views/snippets/s_attributes_horizontal.xml
index e78132a5a..1c49201b9 100644
--- a/theme_orchid/views/snippets/s_attributes_horizontal.xml
+++ b/theme_orchid/views/snippets/s_attributes_horizontal.xml
@@ -8,16 +8,16 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_2.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_2.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_attributes_vertical.xml b/theme_orchid/views/snippets/s_attributes_vertical.xml
index aa227d769..77e1f950b 100644
--- a/theme_orchid/views/snippets/s_attributes_vertical.xml
+++ b/theme_orchid/views/snippets/s_attributes_vertical.xml
@@ -8,13 +8,13 @@
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_1.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_3.svg?c1=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
-        <attribute name="src">/web_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
+        <attribute name="src">/html_editor/shape/website/s_attributes_4.svg?c1=o-color-2&amp;c2=o-color-2&amp;c4=o-color-4&amp;c5=o-color-5</attribute>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_big_number.xml b/theme_orchid/views/snippets/s_big_number.xml
index 2899fadcf..8f6398192 100644
--- a/theme_orchid/views/snippets/s_big_number.xml
+++ b/theme_orchid/views/snippets/s_big_number.xml
@@ -9,7 +9,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_orchid/views/snippets/s_company_team_shapes.xml b/theme_orchid/views/snippets/s_company_team_shapes.xml
index 1f40ea1d7..e09ffb252 100644
--- a/theme_orchid/views/snippets/s_company_team_shapes.xml
+++ b/theme_orchid/views/snippets/s_company_team_shapes.xml
@@ -6,7 +6,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_16" style="background-image: url('/web_editor/shape/html_builder/Airy/16.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Airy_16" style="background-image: url('/html_editor/shape/html_builder/Airy/16.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_freegrid.xml b/theme_orchid/views/snippets/s_freegrid.xml
index 4da7a5167..413aeea85 100644
--- a/theme_orchid/views/snippets/s_freegrid.xml
+++ b/theme_orchid/views/snippets/s_freegrid.xml
@@ -24,7 +24,7 @@
     </xpath>
      <!-- Section Shape -->
     <xpath expr="//section//div" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_03 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder%2FBlobs%2F03.svg?c2=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_03 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder%2FBlobs%2F03.svg?c2=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 </odoo>
diff --git a/theme_orchid/views/snippets/s_kickoff.xml b/theme_orchid/views/snippets/s_kickoff.xml
index 5cc69ebf2..51deb800c 100644
--- a/theme_orchid/views/snippets/s_kickoff.xml
+++ b/theme_orchid/views/snippets/s_kickoff.xml
@@ -11,7 +11,7 @@
 
     <!-- Refine shape's colors -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');</attribute>
+        <attribute name="style">background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');</attribute>
     </xpath>
 
     <!-- Remove the parallax effect: the background image has been already set in the main <section> tag -->
diff --git a/theme_orchid/views/snippets/s_numbers_showcase.xml b/theme_orchid/views/snippets/s_numbers_showcase.xml
index be48a46e5..bb4719bb0 100644
--- a/theme_orchid/views/snippets/s_numbers_showcase.xml
+++ b/theme_orchid/views/snippets/s_numbers_showcase.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml b/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
index 54e7d1f4e..533f4c424 100644
--- a/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Airy/06_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/web_editor/shape/html_builder/Airy/06_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/html_editor/shape/html_builder/Airy/06_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_orchid/views/snippets/s_references.xml b/theme_orchid/views/snippets/s_references.xml
index a99637f3f..9ced3d831 100644
--- a/theme_orchid/views/snippets/s_references.xml
+++ b/theme_orchid/views/snippets/s_references.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-5','c1':'o-color-5'},'flip':['x'],'showOnMobile':true}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-5&amp;c1=o-color-5&amp;flip=x');"></div>
+        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-5&amp;c1=o-color-5&amp;flip=x');"></div>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_title.xml b/theme_orchid/views/snippets/s_title.xml
index ebefa5368..72c38321f 100644
--- a/theme_orchid/views/snippets/s_title.xml
+++ b/theme_orchid/views/snippets/s_title.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-5'},'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5'); background-position: 50% 50%;"/>
     </xpath>
     <xpath expr="//h2" position="attributes">
         <attribute name="class" remove="display-3-fs" separator=" "/>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 35604d152..6d47d00d5 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -44,7 +44,7 @@
         <div class="row">
             <div class="o_colored_level col-lg-5 pt32"/>
             <div class="o_colored_level col-lg-6 offset-lg-1">
-                <img class="img img-fluid" src="/web_editor/shape/theme_paptic/s_cover.svg?c1=o-color-1&amp;c2=o-color-2"/>
+                <img class="img img-fluid" src="/html_editor/shape/theme_paptic/s_cover.svg?c1=o-color-1&amp;c2=o-color-2"/>
             </div>
         </div>
     </xpath>
@@ -58,7 +58,7 @@
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Paptic s_image_text">
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_image_text.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_paptic/s_image_text.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
 
     <xpath expr="//h2" position="replace">
@@ -75,7 +75,7 @@
 <!-- ==== Text-Image ===== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Paptic s_text_image">
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_text_image.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_paptic/s_text_image.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
     <xpath expr="//h2" position="replace">
         <h2>Communication is key!</h2>
@@ -265,7 +265,7 @@
         <attribute name="class" add="pt72 o_cc1" remove="pt64" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_picture.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_paptic/s_picture.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
     </xpath>
 </template>
 
@@ -313,7 +313,7 @@
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_cta_box.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="src">/html_editor/shape/theme_paptic/s_cta_box.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
         <attribute name="style">padding: 40px;</attribute>
     </xpath>
     <!-- Button -->
@@ -500,7 +500,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
@@ -604,7 +604,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/13','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
@@ -770,7 +770,7 @@
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[1]/div[hasclass('o_we_bg_filter')]" position="replace"/>
     <xpath expr="(//div[hasclass('o_grid_item')])[1]/p" position="after">
-        <img class="img img-fluid" src="/web_editor/shape/theme_paptic/s_masonry_block_1.svg?c1=o-color-1&amp;c2=o-color-2"/>
+        <img class="img img-fluid" src="/html_editor/shape/theme_paptic/s_masonry_block_1.svg?c1=o-color-1&amp;c2=o-color-2"/>
     </xpath>
     <!-- Block 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
@@ -779,7 +779,7 @@
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[2]/div[hasclass('o_we_bg_filter')]" position="replace"/>
     <xpath expr="(//div[hasclass('o_grid_item')])[2]/p" position="after">
-        <img class="img img-fluid" src="/web_editor/shape/theme_paptic/s_masonry_block_2.svg?c1=o-color-1&amp;c2=o-color-2"/>
+        <img class="img img-fluid" src="/html_editor/shape/theme_paptic/s_masonry_block_2.svg?c1=o-color-1&amp;c2=o-color-2"/>
     </xpath>
 </template>
 
diff --git a/theme_paptic/views/new_page_template.xml b/theme_paptic/views/new_page_template.xml
index 63e88ac04..f1104e1db 100644
--- a/theme_paptic/views/new_page_template.xml
+++ b/theme_paptic/views/new_page_template.xml
@@ -18,7 +18,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -29,7 +29,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -41,7 +41,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -52,7 +52,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/html_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -62,7 +62,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
 </template>
@@ -73,7 +73,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/html_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
 </template>
diff --git a/theme_real_estate/views/snippets/s_title.xml b/theme_real_estate/views/snippets/s_title.xml
index b24ac3b11..c5d8d85b2 100644
--- a/theme_real_estate/views/snippets/s_title.xml
+++ b/theme_real_estate/views/snippets/s_title.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/web_editor/shape/html_builder/Airy/07_001.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/html_editor/shape/html_builder/Airy/07_001.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_real_estate/views/snippets/s_wavy_grid.xml b/theme_real_estate/views/snippets/s_wavy_grid.xml
index 9c1663ed7..f56ab25a9 100644
--- a/theme_real_estate/views/snippets/s_wavy_grid.xml
+++ b/theme_real_estate/views/snippets/s_wavy_grid.xml
@@ -8,7 +8,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/26','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-4');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_test_custo/data/shapes.xml b/theme_test_custo/data/shapes.xml
index 8175ecaf2..833beca7e 100644
--- a/theme_test_custo/data/shapes.xml
+++ b/theme_test_custo/data/shapes.xml
@@ -5,12 +5,12 @@
 <record id="shape_hexagon_01" model="theme.ir.attachment">
     <field name="name">Hexagon Shape 01</field>
     <field name="key">theme_test_custo.shape_hexagon_01</field>
-    <field name="url">/web_editor/shape/illustration/hexagons/01.svg</field>
+    <field name="url">/html_editor/shape/illustration/hexagons/01.svg</field>
 </record>
 <record id="shape_curve_01" model="theme.ir.attachment">
     <field name="name">Curve Shape 01</field>
     <field name="key">theme_test_custo.shape_curve_01</field>
-    <field name="url">/web_editor/shape/illustration/curves/01.svg</field>
+    <field name="url">/html_editor/shape/illustration/curves/01.svg</field>
 </record>
 
 <!-- Image Shape -->
diff --git a/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml b/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
index 5e7f479d5..be68ed13f 100644
--- a/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/15','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_treehouse/views/snippets/s_sidegrid.xml b/theme_treehouse/views/snippets/s_sidegrid.xml
index e847bbab3..d832633fa 100644
--- a/theme_treehouse/views/snippets/s_sidegrid.xml
+++ b/theme_treehouse/views/snippets/s_sidegrid.xml
@@ -7,7 +7,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/22_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/html_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 079160bea..cd73522b2 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -713,7 +713,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
@@ -840,7 +840,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/26','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/html_editor/shape/html_builder/Bold/26.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_vehicle/views/new_page_template.xml b/theme_vehicle/views/new_page_template.xml
index 862483a09..ff3bc194d 100644
--- a/theme_vehicle/views/new_page_template.xml
+++ b/theme_vehicle/views/new_page_template.xml
@@ -22,7 +22,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/html_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/new_page_template.xml b/theme_yes/views/new_page_template.xml
index 9bcde4025..00fb7ec60 100644
--- a/theme_yes/views/new_page_template.xml
+++ b/theme_yes/views/new_page_template.xml
@@ -73,7 +73,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -84,7 +84,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -96,7 +96,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -159,7 +159,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -171,7 +171,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -195,7 +195,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -208,7 +208,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -220,7 +220,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -242,7 +242,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -261,7 +261,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/html_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_kickoff.xml b/theme_yes/views/snippets/s_kickoff.xml
index 9d6c66434..8c1d8fe5f 100644
--- a/theme_yes/views/snippets/s_kickoff.xml
+++ b/theme_yes/views/snippets/s_kickoff.xml
@@ -12,7 +12,7 @@
         <!-- Remove Parallax + shape -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/html_editor/shape/html_builder/Connections/05.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
         <attribute name="class" add="bg-black-25" remove="bg-black-50" separator=" "/>
diff --git a/theme_yes/views/snippets/s_three_columns.xml b/theme_yes/views/snippets/s_three_columns.xml
index 6d1959568..ea5349ddb 100644
--- a/theme_yes/views/snippets/s_three_columns.xml
+++ b/theme_yes/views/snippets/s_three_columns.xml
@@ -10,7 +10,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_12" style="background-image: url('/web_editor/shape/html_builder/Connections/12.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_12" style="background-image: url('/html_editor/shape/html_builder/Connections/12.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Column 1 -->
     <xpath expr="//*[hasclass('card-title')]" position="replace" mode="inner">
diff --git a/theme_zap/views/new_page_template.xml b/theme_zap/views/new_page_template.xml
index 6f1a11cd2..2acb61fc9 100644
--- a/theme_zap/views/new_page_template.xml
+++ b/theme_zap/views/new_page_template.xml
@@ -21,7 +21,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -77,7 +77,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -95,7 +95,7 @@
         <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/html_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_zap/views/snippets/s_big_number.xml b/theme_zap/views/snippets/s_big_number.xml
index 89c7f8427..c67fabda5 100644
--- a/theme_zap/views/snippets/s_big_number.xml
+++ b/theme_zap/views/snippets/s_big_number.xml
@@ -9,7 +9,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/Airy/14_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/html_editor/shape/html_builder/Airy/14_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_zap/views/snippets/s_cta_card.xml b/theme_zap/views/snippets/s_cta_card.xml
index 50fba075b..f43fb7421 100644
--- a/theme_zap/views/snippets/s_cta_card.xml
+++ b/theme_zap/views/snippets/s_cta_card.xml
@@ -9,7 +9,7 @@
    </xpath>
    <!-- Shape -->
    <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-      <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
+      <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
    </xpath>
    <!-- Text Col -->
    <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
diff --git a/theme_zap/views/snippets/s_discovery.xml b/theme_zap/views/snippets/s_discovery.xml
index 6d9db281f..9d7ab01d7 100644
--- a/theme_zap/views/snippets/s_discovery.xml
+++ b/theme_zap/views/snippets/s_discovery.xml
@@ -11,7 +11,7 @@
     <!-- Shape and Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c1=o-color-3&amp;c5=rgba(0,0,0,0)');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c1=o-color-3&amp;c5=rgba(0,0,0,0)');"/>
     </xpath>
     <!-- CTA -->
     <xpath expr="//span[hasclass('s_cta_badge')]" position="replace" mode="inner">
diff --git a/theme_zap/views/snippets/s_image_title.xml b/theme_zap/views/snippets/s_image_title.xml
index 9fc689de7..4f167e8ea 100644
--- a/theme_zap/views/snippets/s_image_title.xml
+++ b/theme_zap/views/snippets/s_image_title.xml
@@ -9,7 +9,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c1=o-color-4&amp;c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/html_editor/shape/html_builder/Bold/14.svg?c1=o-color-4&amp;c5=o-color-4');"/>
     </xpath>
 
 </template>
diff --git a/theme_zap/views/snippets/s_pricelist_boxed.xml b/theme_zap/views/snippets/s_pricelist_boxed.xml
index b7f340faf..94c17a108 100644
--- a/theme_zap/views/snippets/s_pricelist_boxed.xml
+++ b/theme_zap/views/snippets/s_pricelist_boxed.xml
@@ -9,7 +9,7 @@
         <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/html_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>