diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 400d5bfacb5..c83b290829e 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -414,7 +414,7 @@
          data-selector="#wrapwrap > header"
          data-no-check="true"
          groups="website.group_website_designer">
-        <we-checkbox string="Show Sign In" data-customize-website-views="portal.portal_show_sign_in" data-reload="/"/>
+        <we-checkbox string="Sign In" data-customize-website-views="portal.portal_show_sign_in" data-reload="/"/>
         <we-colorpicker string="Colors"
                         data-customize-website-color="" data-color="menu"
                         data-with-combinations="true"/>
@@ -427,24 +427,24 @@
             <we-button data-customize-website-views="website.layout_logo_show">Image</we-button>
             <we-button data-customize-website-views="website.header_logo_none" data-name="header_logo_none_opt">None</we-button>
         </we-select>
-        <we-input string="Logo Height"
+        <we-input string="⌙ Height"
                   data-dependencies="!header_logo_none_opt"
                   data-customize-website-variable="null"
                   data-variable="logo-height"
                   data-unit="px"
                   data-save-unit="rem"/>
-        <we-input string="Logo Height (Scrolled)"
+        <we-input string="⌙ Height (Scrolled)"
                   data-name="option_logo_height_scrolled"
-                  data-dependencies="!header_visibility_scroll_opt"
                   data-customize-website-variable="null"
                   data-variable="fixed-logo-height"
                   data-unit="px"
-                  data-save-unit="rem"/>
+                  data-save-unit="rem"
+                  data-dependencies="!header_effect_scroll_opt"/>
         <we-row string="Font">
             <we-fontfamilypicker data-variable="navbar-font-number"/>
             <we-input data-customize-website-variable="null" data-variable="header-font-size" data-unit="px" data-save-unit="rem"/>
         </we-row>
-        <we-select id="header_templates_select" data-variable="header-template" string="Header Template" data-reload="/">
+        <we-select id="header_templates_select" data-variable="header-template" string="Template" data-reload="/">
             <we-button id="option_template_header_logo_menu"
                        data-name="header_logo_menu_opt"
                        data-customize-website-views=""
@@ -471,37 +471,38 @@
                        data-customize-website-variable="logo_hamburger"
                        string="Logo - Hamburger (cover)"/>
         </we-select>
-        <we-select id="header_visibilities_list" string="Header Visibility">
-            <we-button id="option_header_visibility_standard"
-                       data-name="header_visibility_standard_opt"
+        <we-select id="header_effect_list" string="Effect">
+            <we-button id="option_header_effect_standard"
+                       data-name="header_effect_standard_opt"
                        data-select-class="o_header_standard"
                        data-customize-website-views="website.header_visibility_standard"
                        string="Standard"/>
-            <we-button id="option_header_visibility_scroll"
-                       data-name="header_visibility_scroll_opt"
+            <we-button id="option_header_effect_scroll"
+                       data-name="header_effect_scroll_opt"
                        data-select-class=""
                        data-customize-website-views=""
                        string="Scroll"/>
-            <we-button id="option_header_visibility_fixed"
-                       data-name="header_visibility_fixed_opt"
+            <we-button id="option_header_effect_fixed"
+                       data-name="header_effect_fixed_opt"
                        data-select-class="o_header_fixed"
                        data-customize-website-views="website.header_visibility_fixed"
                        string="Fixed"/>
-            <we-button id="option_header_visibility_disappears"
-                       data-name="header_visibility_disappears_opt"
+            <we-button id="option_header_effect_disappears"
+                       data-name="header_effect_disappears_opt"
                        data-select-class="o_header_disappears"
                        data-customize-website-views="website.header_visibility_disappears"
                        string="Disappears"/>
-            <we-button id="option_header_visibility_fade_out"
-                       data-name="header_visibility_fade_out_opt"
+            <we-button id="option_header_effect_fade_out"
+                       data-name="header_effect_fade_out_opt"
                        data-select-class="o_header_fade_out"
                        data-customize-website-views="website.header_visibility_fade_out"
                        string="Fade Out"/>
         </we-select>
-        <we-checkbox string="Hoverable Dropdown"
-                     data-customize-website-views="website.header_hoverable_dropdown"
-                     data-select-class="o_hoverable_dropdown"
-                     data-no-preview="true"/>
+        <we-select id="option_header_dropdown" string="Sub Menus" data-no-preview="true">
+            <we-button data-select-class="o_hoverable_dropdown"
+                       data-customize-website-views="website.header_hoverable_dropdown">On Hover</we-button>
+            <we-button data-select-class="" data-name="header_dropdown_on_click_opt">On Click</we-button>
+        </we-select>
 
         <we-checkbox string="Button" data-customize-website-views="website.header_button" data-reload="/"/>
     </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index edf0aa798bb..3ebbf776f61 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -224,7 +224,7 @@
     </xpath>
 </template>
 
-<!-- Navbar templates -->
+<!-- Header templates -->
 <template id="template_header_hamburger" inherit_id="website.layout" name="Template Header Logo Hamburger" active="False">
     <xpath expr="//header//nav[hasclass('navbar')]" position="attributes">
         <attribute name="class" remove="navbar-expand-md" separator=" "/>
@@ -252,7 +252,7 @@
     </xpath>
 </template>
 
-<!-- Navbar options -->
+<!-- Header options -->
 <template id="option_layout_hide_header" inherit_id="website.layout" active="False">
     <xpath expr="//header" position="before">
         <t t-set="no_header" t-value="True"/>
@@ -273,25 +273,25 @@
     </xpath>
 </template>
 
-<template id="header_visibility_standard" inherit_id="website.layout" name="Header Visibility Standard">
+<template id="header_visibility_standard" inherit_id="website.layout" name="Header Effect Standard">
     <xpath expr="//header" position="attributes">
         <attribute name="t-attf-class" add="o_header_standard o_top_fixed_element" separator=" "/>
     </xpath>
 </template>
 
-<template id="header_visibility_fixed" inherit_id="website.layout" name="Header Visibility Fixed" active="False">
+<template id="header_visibility_fixed" inherit_id="website.layout" name="Header Effect Fixed" active="False">
     <xpath expr="//header" position="attributes">
         <attribute name="t-attf-class" add="o_header_fixed o_top_fixed_element" separator=" "/>
     </xpath>
 </template>
 
-<template id="header_visibility_disappears" inherit_id="website.layout" name="Header Visibility Disappears" active="False">
+<template id="header_visibility_disappears" inherit_id="website.layout" name="Header Effect Disappears" active="False">
     <xpath expr="//header" position="attributes">
         <attribute name="t-attf-class" add="o_header_disappears o_top_fixed_element" separator=" "/>
     </xpath>
 </template>
 
-<template id="header_visibility_fade_out" inherit_id="website.layout" name="Header Visibility Fade Out" active="False">
+<template id="header_visibility_fade_out" inherit_id="website.layout" name="Header Effect Fade Out" active="False">
     <xpath expr="//header" position="attributes">
         <attribute name="t-attf-class" add="o_header_fade_out o_top_fixed_element" separator=" "/>
     </xpath>
@@ -332,7 +332,7 @@
     </xpath>
 </template>
 
-<!-- Footer templates -->
+<!-- Footer options -->
 <template id="footer_custom" inherit_id="website.layout" name="Footer">
     <xpath expr="//div[@id='footer']" position="replace">
         <div id="footer" class="oe_structure oe_structure_solo" t-ignore="true" t-if="not no_footer">