diff --git a/addons/mass_mailing/static/image_shapes/basic/circle.svg b/addons/mass_mailing/static/image_shapes/basic/circle.svg
index 03bd8874acc..30fb07e6995 100644
--- a/addons/mass_mailing/static/image_shapes/basic/circle.svg
+++ b/addons/mass_mailing/static/image_shapes/basic/circle.svg
@@ -5,7 +5,7 @@
 		</clipPath>
 		<path id="filterPath" d="M0.5,1C-0.1667,0.9795-0.1667,0.0203,0.5,0C1.1667,0.0205,1.1667,0.9797,0.5,1z"></path>
 	</defs>
-	<svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none">
+	<svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none">
 		<use xlink:href="#filterPath" fill="darkgrey"></use>
 	</svg>
 	<image xlink:href="" clip-path="url(#clip-path)"></image>
diff --git a/addons/mass_mailing/static/image_shapes/basic/slanted.svg b/addons/mass_mailing/static/image_shapes/basic/slanted.svg
index 976cdccb97c..134fbc19359 100644
--- a/addons/mass_mailing/static/image_shapes/basic/slanted.svg
+++ b/addons/mass_mailing/static/image_shapes/basic/slanted.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
 
-<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path></defs><svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
\ No newline at end of file
+<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M0.4128,0h0.5872L0.5872,1H0L0.4128,0z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
diff --git a/addons/mass_mailing/static/image_shapes/basic/triangle.svg b/addons/mass_mailing/static/image_shapes/basic/triangle.svg
index 2376040b055..13df53ed55a 100644
--- a/addons/mass_mailing/static/image_shapes/basic/triangle.svg
+++ b/addons/mass_mailing/static/image_shapes/basic/triangle.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="600">
 
-<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M1,1L0,0h1V1z"></path></defs><svg viewBox="0 0 1 1" width="800" height="600" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
\ No newline at end of file
+<defs><clipPath id="clip-path" clipPathUnits="objectBoundingBox"><use xlink:href="#filterPath" fill="none"></use></clipPath><path id="filterPath" d="M1,1L0,0h1V1z"></path></defs><svg viewBox="0 0 1 1" id="preview" preserveAspectRatio="none"><use xlink:href="#filterPath" fill="darkgrey"></use></svg><image xlink:href="" clip-path="url(#clip-path)"></image></svg>
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1-circle.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1-circle.png
deleted file mode 100644
index 2925366fdd2..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1-circle.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2-circle.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2-circle.png
deleted file mode 100644
index 385a1982c2b..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2-circle.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3-circle.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3-circle.png
deleted file mode 100644
index fa953b7d818..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3-circle.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4-circle.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4-circle.png
deleted file mode 100644
index 66859ca1f37..00000000000
Binary files a/addons/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4-circle.png and /dev/null differ
diff --git a/addons/mass_mailing/views/snippets/s_blockquote.xml b/addons/mass_mailing/views/snippets/s_blockquote.xml
index f5763fcb133..e3ed697e639 100644
--- a/addons/mass_mailing/views/snippets/s_blockquote.xml
+++ b/addons/mass_mailing/views/snippets/s_blockquote.xml
@@ -12,7 +12,7 @@
                     <div>
                         <p><i>Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.</i></p>
                         <div>
-                            <img src="/mass_mailing/static/src/img/theme_default/team_member_2-circle.png" style="width: 40px" class="img me-2" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.jpg" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                            <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" style="width: 40px" class="img me-2" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             <p style="font-weight: bolder; font-size: 14px;"><b>John DOE</b> &#8226; CEO of MyCompany</p>
                         </div>
                     </div>
diff --git a/addons/mass_mailing/views/snippets/s_company_team.xml b/addons/mass_mailing/views/snippets/s_company_team.xml
index 178bffbe714..4fc56f0d348 100644
--- a/addons/mass_mailing/views/snippets/s_company_team.xml
+++ b/addons/mass_mailing/views/snippets/s_company_team.xml
@@ -9,7 +9,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 pb16 px-0">
-                                <img src="/web/image/mass_mailing.s_company_team_default_image_1" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_1/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_1-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Tony Fred, CEO</h3>
@@ -22,7 +22,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web/image/mass_mailing.s_company_team_default_image_2" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_2/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_2-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Mich Stark, COO</h3>
@@ -35,7 +35,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web/image/mass_mailing.s_company_team_default_image_3" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_3/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_3-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Aline Turner, CTO</h3>
@@ -48,7 +48,7 @@
                     <div class="container">
                         <div class="row">
                             <div class="col-lg-3 px-0 pb16">
-                                <img src="/web/image/mass_mailing.s_company_team_default_image_4" class="img-fluid mx-auto" data-original-id="361" data-original-src="/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png" data-mimetype="image/svg+xml" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.png" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
+                                <img src="/web_editor/image_shape/mass_mailing.s_company_team_default_image_4/mass_mailing/basic/circle.svg" class="img-fluid mx-auto" data-shape="mass_mailing/basic/circle" data-file-name="team_member_4-circle.svg" data-shape-colors=";;;;" data-original-mimetype="image/png"/>
                             </div>
                             <div class="col-lg-9">
                                 <h3>Iris Joe, CFO</h3>