diff --git a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
index cabe4eb8cc5..28ac0bd177b 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js
@@ -95,36 +95,17 @@ options.registry.mass_mailing_sizing_x = options.Class.extend({
 
 // Adding compatibility for the outlook compliance of mailings.
 // Commit of such compatibility : a14f89c8663c9cafecb1cc26918055e023ecbe42
-options.registry.BackgroundImage = options.registry.BackgroundImage.extend({
+options.registry.MassMailingBackgroundImage = options.registry.BackgroundImage.extend({
     start: function () {
         this._super();
-        if (this.snippets && this.snippets.split('.')[0] === "mass_mailing") {
-            var $table_target = this.$target.find('table:first');
-            if ($table_target.length) {
-                this.$target = $table_target;
-            }
+        const $table_target = this.$target.find('table:first');
+        if ($table_target.length) {
+            this.$target = $table_target;
         }
     }
 });
 
-options.registry.ImageTools.include({
-
-    //--------------------------------------------------------------------------
-    // Public
-    //--------------------------------------------------------------------------
-
-    /**
-     * @override
-     */
-    async updateUIVisibility() {
-        await this._super(...arguments);
-
-        // Transform is _very_ badly supported in mail clients. Hide the option.
-        const transformEl = this.el.querySelector('[data-transform="true"]');
-        if (transformEl) {
-            transformEl.classList.toggle('d-none', true);
-        }
-    },
+options.registry.MassMailingImageTools = options.registry.ImageTools.extend({
 
     //--------------------------------------------------------------------------
     // Private
@@ -138,14 +119,11 @@ options.registry.ImageTools.include({
             return color;
         }
         const doc = this.options.document;
-        if (doc && doc.querySelector('.o_mass_mailing_iframe') && !ColorpickerWidget.isCSSColor(color)) {
-            const tempEl = doc.body.appendChild(doc.createElement('div'));
-            tempEl.className = `bg-${color}`;
-            const colorValue = window.getComputedStyle(tempEl).getPropertyValue("background-color").trim();
-            tempEl.parentNode.removeChild(tempEl);
-            return ColorpickerWidget.normalizeCSSColor(colorValue).replace(/"/g, "'");
-        }
-        return this._super(...arguments);
+        const tempEl = doc.body.appendChild(doc.createElement('div'));
+        tempEl.className = `bg-${color}`;
+        const colorValue = window.getComputedStyle(tempEl).getPropertyValue("background-color").trim();
+        tempEl.parentNode.removeChild(tempEl);
+        return ColorpickerWidget.normalizeCSSColor(colorValue).replace(/"/g, "'");
     },
 });
 
@@ -402,19 +380,4 @@ options.registry.DesignTab = options.Class.extend({
     },
 });
 
-options.registry.Parallax = options.Class.extend({
-
-    //--------------------------------------------------------------------------
-    // Private
-    //--------------------------------------------------------------------------
-
-    /**
-     * @override
-     */
-    async _computeWidgetVisibility(widgetName, params) {
-        // Parallax is not supported in emails.
-        return false;
-    },
-});
-
 });
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 21d34284545..c81fcec1f71 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -293,7 +293,31 @@
             t-att-data-variable="radius_variable"/>
 </template>
 
+<template id="snippet_options_background_options" inherit_id="web_editor.snippet_options_background_options" primary="True">
+    <xpath expr="//div[@data-js='BackgroundImage']" position="attributes">
+        <attribute name="data-js">MassMailingBackgroundImage</attribute>
+    </xpath>
+</template>
+
 <template id="snippet_options_extra_shapes" inherit_id="web_editor.snippet_options">
+    <div><!-- TODO remove me in 16.0 post-backport --></div>
+</template>
+
+<template id="snippet_options_image_styles" inherit_id="web_editor.snippet_options">
+    <div><!-- TODO remove me in 16.0 post-backport --></div>
+</template>
+
+<!-- Mass Mailing Snippet Options -->
+<template id="snippet_options" inherit_id="web_editor.snippet_options" primary="True">
+    <!-- =================================================================== -->
+    <!-- Modify generic snippet options                                      -->
+    <!-- =================================================================== -->
+
+    <xpath expr="//t[@t-set='no_animations']" position="attributes">
+        <attribute name="t-value">True</attribute>
+    </xpath>
+
+    <!-- Extra shapes -->
     <xpath expr="//div[hasclass('o_we_image_shape')]//we-select-page[hasclass('o_we_basic_shapes')]" position="inside">
         <we-button data-set-img-shape="mass_mailing/basic/circle" data-select-label="Circle"/>
         <we-button data-set-img-shape="mass_mailing/basic/triangle" data-select-label="Triangle"/>
@@ -302,9 +326,11 @@
     <xpath expr="//div[hasclass('o_we_image_shape')]//we-select-page[hasclass('o_we_basic_shapes')]" position="attributes">
         <attribute name="t-if">True</attribute>
     </xpath>
-</template>
 
-<template id="snippet_options_image_styles" inherit_id="web_editor.snippet_options">
+    <!-- Image styles -->
+    <!-- TODO review to only modify what's really necessary and potentially -->
+    <!-- make the changes in web_editor directly so that website can benefit -->
+    <!-- from it. -->
     <xpath expr="//div[hasclass('o_we_image_options')]" position="replace">
         <div data-selector="span.fa, i.fa, img">
             <we-select string="Alignment" data-state-to-first-class="true">
@@ -333,12 +359,19 @@
             </we-row>
         </div>
     </xpath>
-</template>
-<!-- Snippet themes Options -->
-<template id="snippet_options">
-    <t t-set="no_animations" t-value="True"/>
-    <t t-call="mass_mailing.snippet_options_extra_shapes"/>
-    <t t-out="0"/>
+
+    <!-- Transform is _very_ badly supported in mail clients -->
+    <xpath expr="//we-button[@data-name='image_transform_opt']" position="replace" />
+
+    <xpath expr="//div[@data-js='ImageTools']" position="attributes">
+        <attribute name="data-js">MassMailingImageTools</attribute>
+    </xpath>
+
+    <!-- =================================================================== -->
+    <!-- Adding mass_mailing specific snippet options                        -->
+    <!-- =================================================================== -->
+
+    <xpath expr="." position="inside">
 
     <!-- Border | Columns -->
     <div data-js="Box"
@@ -471,7 +504,7 @@
     </div>
 
     <!-- Allow changing background images in Masonry and Cover -->
-    <t t-call="web_editor.snippet_options_background_options">
+    <t t-call="mass_mailing.snippet_options_background_options">
         <t t-set="selector" t-value="'.s_masonry_block .row > div, .s_cover .oe_img_bg'"/>
         <t t-set="with_images" t-value="True"/>
         <t t-set="with_videos" t-value="false"/>
@@ -793,5 +826,8 @@
             <we-button data-customize-css-property="100%">100%</we-button>
         </we-select>
     </div>
+
+    </xpath>
 </template>
+
 </odoo>
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index 250d8f9a8a0..e2324796c56 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -454,6 +454,7 @@
             title="'Title tag' is shown as a tooltip when you hover the picture."/>
     </div>
 
+    <t t-set="no_animations" t-value="False"/>
     <div data-js="ImageTools"
          data-selector="img">
         <div class="o_we_image_shape">
@@ -579,7 +580,7 @@
             <we-button class="ms-0 border-start-0" data-reset-crop="" data-no-preview="true" title="Reset crop">
                 Reset
             </we-button>
-            <we-button class="fa fa-fw fa-object-ungroup" data-name="image_transform_opt" data-transform="true" data-no-preview="true" title="Transform the picture" t-att-data-dependencies="image_transform_dependencies"/>
+            <we-button class="fa fa-fw fa-object-ungroup" data-name="image_transform_opt" data-transform="true" data-no-preview="true" title="Transform the picture"/>
             <we-button class="ms-0 border-start-0" data-reset-transform="" data-no-preview="true" title="Reset transformation">
                 Reset
             </we-button>
diff --git a/addons/website/views/snippets/s_blockquote.xml b/addons/website/views/snippets/s_blockquote.xml
index 63700cef284..3d29ebe2032 100644
--- a/addons/website/views/snippets/s_blockquote.xml
+++ b/addons/website/views/snippets/s_blockquote.xml
@@ -26,7 +26,7 @@
         </div>
 
         <!-- Color and images -->
-        <t t-call="web_editor.snippet_options_background_options">
+        <t t-call="website.snippet_options_background_options">
             <t t-set="selector" t-value="'.s_blockquote'"/>
             <t t-set="target" t-value="'.s_blockquote_content'"/>
             <t t-set="with_colors" t-value="True"/>
diff --git a/addons/website/views/snippets/s_image_gallery.xml b/addons/website/views/snippets/s_image_gallery.xml
index c4eecc806c2..e1971a522cc 100644
--- a/addons/website/views/snippets/s_image_gallery.xml
+++ b/addons/website/views/snippets/s_image_gallery.xml
@@ -62,7 +62,7 @@
 </template>
 
 <template id="s_image_gallery_options" inherit_id="website.snippet_options">
-    <xpath expr="//t[@t-call='web_editor.snippet_options_background_options']" position="before">
+    <xpath expr="//t[@t-call='website.snippet_options_background_options']" position="before">
         <div data-js="gallery" data-selector=".s_image_gallery">
             <we-row string="Images">
                 <we-button class="o_we_bg_success" data-add-images="true" data-no-preview="true">Add</we-button>
diff --git a/addons/website/views/snippets/s_media_list.xml b/addons/website/views/snippets/s_media_list.xml
index 9cd9e3e6c00..176c1a165bb 100644
--- a/addons/website/views/snippets/s_media_list.xml
+++ b/addons/website/views/snippets/s_media_list.xml
@@ -46,7 +46,7 @@
 </template>
 
 <template id="s_media_list_options" inherit_id="website.snippet_options">
-    <xpath expr="//t[@t-call='web_editor.snippet_options_background_options']" position="before">
+    <xpath expr="//t[@t-call='website.snippet_options_background_options']" position="before">
         <div data-js="MultipleItems" data-selector=".s_media_list">
             <we-row string="Media">
                 <we-button data-add-item="" data-item=".s_media_list_item:last" data-select-item="" data-no-preview="true" class="o_we_bg_brand_primary">
@@ -56,7 +56,7 @@
         </div>
     </xpath>
     <xpath expr="." position="inside">
-        <t t-call="web_editor.snippet_options_background_options">
+        <t t-call="website.snippet_options_background_options">
             <t t-set="selector" t-value="'.s_media_list_item'"/>
             <t t-set="target" t-value="'&gt; .row'"/>
             <t t-set="with_colors" t-value="True"/>
diff --git a/addons/website/views/snippets/s_product_catalog.xml b/addons/website/views/snippets/s_product_catalog.xml
index 2a256df8df3..3a820652da7 100644
--- a/addons/website/views/snippets/s_product_catalog.xml
+++ b/addons/website/views/snippets/s_product_catalog.xml
@@ -66,7 +66,7 @@
 </template>
 
 <template id="s_product_catalog_options" inherit_id="website.snippet_options">
-    <xpath expr="//t[@t-call='web_editor.snippet_options_background_options']" position="before">
+    <xpath expr="//t[@t-call='website.snippet_options_background_options']" position="before">
         <div data-js="MultipleItems"
              data-selector=".s_product_catalog">
             <t t-call="website.s_product_catalog_add_product_widget">
diff --git a/addons/website/views/snippets/s_table_of_content.xml b/addons/website/views/snippets/s_table_of_content.xml
index 2f30d6fbbc6..6c999764411 100644
--- a/addons/website/views/snippets/s_table_of_content.xml
+++ b/addons/website/views/snippets/s_table_of_content.xml
@@ -47,7 +47,7 @@
 </template>
 
 <template id="s_table_of_content_options" inherit_id="website.snippet_options">
-    <xpath expr="//t[@t-call='web_editor.snippet_options_background_options']" position="before">
+    <xpath expr="//t[@t-call='website.snippet_options_background_options']" position="before">
         <div data-js="MultipleItems" data-selector=".s_table_of_content">
             <we-row string="Content">
                 <we-button data-add-item="" data-item=".s_table_of_content_main > section:last" data-select-item="" data-no-preview="true" class="o_we_bg_brand_primary">
diff --git a/addons/website/views/snippets/s_timeline.xml b/addons/website/views/snippets/s_timeline.xml
index 32f927e9f0f..7608167a680 100644
--- a/addons/website/views/snippets/s_timeline.xml
+++ b/addons/website/views/snippets/s_timeline.xml
@@ -53,7 +53,7 @@
 </template>
 
 <template id="s_timeline_options" inherit_id="website.snippet_options">
-    <xpath expr="//t[@t-call='web_editor.snippet_options_background_options']" position="before">
+    <xpath expr="//t[@t-call='website.snippet_options_background_options']" position="before">
         <div data-js="MultipleItems" data-selector=".s_timeline">
             <we-row string="Year">
                 <we-button data-add-item="" data-item=".s_timeline_row:first" data-select-item="" data-add-before="true" data-no-preview="true" class="o_we_bg_brand_primary">
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 51bf8a45f4d..8b8ef6bbfed 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -186,7 +186,7 @@
     </xpath>
 </template>
 
-<template id="snippet_options_background_options" inherit_id="web_editor.snippet_options_background_options">
+<template id="snippet_options_background_options" inherit_id="web_editor.snippet_options_background_options" primary="True">
     <xpath expr="//we-button[@data-toggle-bg-image]" position="after">
         <t t-if="with_videos">
             <we-button title="Video" class="fa fa-fw fa-film"
@@ -335,10 +335,20 @@
         data-allow-delete="true" data-fakem2m="true"/>
 </template>
 
-<template id="snippet_options">
-    <t t-call="web_editor.snippet_options">
-        <t t-set="image_transform_dependencies" t-valuef="no_animation_opt"/>
-    </t>
+<template id="snippet_options" inherit_id="web_editor.snippet_options" primary="True">
+    <!-- =================================================================== -->
+    <!-- Modify generic snippet options                                      -->
+    <!-- =================================================================== -->
+
+    <xpath expr="//we-button[@data-name='image_transform_opt']" position="attributes">
+        <attribute name="data-dependencies">no_animation_opt</attribute>
+    </xpath>
+
+    <!-- =================================================================== -->
+    <!-- Adding website specific snippet options                             -->
+    <!-- =================================================================== -->
+
+    <xpath expr="." position="inside">
 
     <!-- COLOR, BORDER, SHADOW | .s_three_columns | .s_comparisons -->
     <div data-js="Box"
@@ -412,7 +422,7 @@
     <!-- Carousel | .s_carousel | .s_quotes_carousel -->
     <!-- Dedicated colorpicker so that there is not 3 level of
          o_colored_level. Use inline-style color for the same reason. -->
-    <t t-call="web_editor.snippet_options_background_options">
+    <t t-call="website.snippet_options_background_options">
         <t t-set="selector" t-value="'section'"/>
         <t t-set="target" t-value="'> .carousel'"/>
         <t t-set="with_colors" t-value="True"/>
@@ -552,7 +562,7 @@
     <t t-set="both_bg_color_image_selector" t-value="'section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax'"/>
     <t t-set="both_bg_color_image_exclude" t-value="base_only_bg_image_selector + ', .s_carousel_wrapper, .s_color_blocks_2, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block, .s_masonry_block .s_col_no_resize'"/>
 
-    <t t-call="web_editor.snippet_options_background_options">
+    <t t-call="website.snippet_options_background_options">
         <t t-set="selector" t-value="both_bg_color_image_selector"/>
         <t t-set="exclude" t-value="both_bg_color_image_exclude"/>
         <t t-set="with_colors" t-value="True"/>
@@ -563,7 +573,7 @@
         <t t-set="with_gradients" t-value="True"/>
     </t>
 
-    <t t-call="web_editor.snippet_options_background_options">
+    <t t-call="website.snippet_options_background_options">
         <t t-set="selector" t-value="only_bg_color_selector"/>
         <t t-set="exclude" t-value="only_bg_color_exclude"/>
         <t t-set="with_colors" t-value="True"/>
@@ -572,7 +582,7 @@
         <t t-set="with_gradients" t-value="True"/>
     </t>
 
-    <t t-call="web_editor.snippet_options_background_options">
+    <t t-call="website.snippet_options_background_options">
         <t t-set="selector" t-value="only_bg_image_selector"/>
         <t t-set="exclude" t-value="only_bg_image_exclude"/>
         <t t-set="with_colors" t-value="False"/>
@@ -1591,5 +1601,7 @@
     <div data-selector="#wrapwrap > main" data-no-check="true" data-js="SwitchableViews">
             <!-- Options will be populated by JS -->
     </div>
+
+    </xpath>
 </template>
 </odoo>