diff --git a/conf.py b/conf.py
index 5ee05a122..032aadfe5 100644
--- a/conf.py
+++ b/conf.py
@@ -1,3 +1,4 @@
+import os
 import sys
 from pathlib import Path
 
@@ -166,7 +167,7 @@ html_theme_path = ['extensions']
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None  TODO ANVFE remove?
+html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'favicon.ico')
 
 # Add any paths that contain custom static files (such as style sheets) here, relative to this
 # directory. They are copied after the builtin static files, so a file named "default.css" will
diff --git a/extensions/odoo_theme/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html
index a07b37976..52db73ef1 100644
--- a/extensions/odoo_theme/layout_templates/version_switcher.html
+++ b/extensions/odoo_theme/layout_templates/version_switcher.html
@@ -7,7 +7,7 @@
             <button class="btn border dropdown-toggle" id="versions" data-bs-toggle="dropdown">
                 {{ version }} {# The current version #}
             </button>
-            <ul class="dropdown-menu" aria-labelledby="versions">
+            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="versions">
                 {% for alternate_version, url in alternate_versions %}
                     <li><a class="dropdown-item" href="{{ url }}">{{ alternate_version }}</a></li>
                 {% endfor %}
diff --git a/requirements.txt b/requirements.txt
index ed001db85..e4a92b412 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 pygments~=2.6.1
 pysass~=0.1.0
 sphinx~=3.0
-werkzeug==0.14.1
+werkzeug==0.14.1 # TODO ANVFE bump werkzeug to 0.16 ?
 sphinx-patchqueue>=1.0