diff --git a/addons/website/static/src/img/s_website_form.png b/addons/website/static/src/img/s_website_form.png
new file mode 100644
index 00000000000..3df58edabd1
Binary files /dev/null and b/addons/website/static/src/img/s_website_form.png differ
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 93817baa570..ae8812522f3 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -893,6 +893,7 @@
 <template id="external_snippets" inherit_id="website.snippets" priority="8">
     <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
         <t t-install="website_twitter" string="Twitter Scroller" t-thumbnail="/website/static/src/img/snippets_thumbs/s_twitter_scroll.png"/>
+        <t t-install="website_form_editor" string="Form Builder" t-thumbnail="/website/static/src/img/s_website_form.png"/>
         <t id="s_products_searchbar" t-install="website_sale" string="Products Search" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
     </xpath>
     <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
diff --git a/addons/website_form_editor/__manifest__.py b/addons/website_form_editor/__manifest__.py
index aa01fb66d5a..db2a2ae4573 100644
--- a/addons/website_form_editor/__manifest__.py
+++ b/addons/website_form_editor/__manifest__.py
@@ -9,7 +9,7 @@
 Customize and create your own web forms.
 This module adds a new building block in the website builder in order to build new forms from scratch in any website page.
     """,
-    'depends': ['website_enterprise', 'website_form'],
+    'depends': ['website_form'],
     'data': [
         'data/mail_mail_data.xml',
         'views/website_form_editor_templates.xml',
diff --git a/addons/website_form_editor/views/snippets.xml b/addons/website_form_editor/views/snippets.xml
index 9e399a13f54..970eb762d71 100644
--- a/addons/website_form_editor/views/snippets.xml
+++ b/addons/website_form_editor/views/snippets.xml
@@ -13,13 +13,13 @@
             </form>
         </template>
 
-        <template id="remove_external_snippets" inherit_id="website_enterprise.external_snippets">
+        <template id="remove_external_snippets" inherit_id="website.external_snippets">
             <xpath expr="//t[@t-install='website_form_editor']" position="replace"/>
         </template>
 
         <template id="register_s_website_form" inherit_id="website.snippets" name="Snippet Form Builder">
             <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
-                <t t-snippet="website_form_editor.s_website_form" t-thumbnail="/website_enterprise/static/src/img/s_website_form.png"/>
+                <t t-snippet="website_form_editor.s_website_form" t-thumbnail="/website/static/src/img/s_website_form.png"/>
             </xpath>
         </template>