diff --git a/_extensions/odoo_ext/breadcrumb_list.html b/_extensions/odoo_ext/breadcrumb_list.html
index d66330bd9..7e2f3c934 100644
--- a/_extensions/odoo_ext/breadcrumb_list.html
+++ b/_extensions/odoo_ext/breadcrumb_list.html
@@ -1,22 +1,20 @@
 {# warning: if doc structure change, these rules may have to change as well #}
 
 {# =====  VARIABLES  ====== #}
-{% set master_doc_short_name = 'Odoo Doc' %}
+{% set master_doc_short_name = 'Documentation' %}
 <!-- VFE TODO use value from config ? -->
 
 {% if pagename == master_doc %}
     <li><a href="{{ pathto(master_doc) }}" class="active">{{ master_doc_short_name }}</a></li>
 {% else %}
+    {# Do not show main TOC link when in user/dev doc subpages to shorten breadcrumb links #}
+    {% if 'show_main_toc_link' in meta %}
+        <li><a href="{{ pathto(master_doc) }}">{{ master_doc_short_name }}</a></li>
+    {% endif %}
     {% for parent in parents %}
-        {% if loop.length > 1%}
-            {% if loop.first %}
-                <li><a href="{{ pathto(master_doc) }}">{{ master_doc_short_name }}</a></li>
-            {% else %}
-                <li><a href="{{ parent.link|e }}">{{parent.title}}</a></li>
-            {% endif %}
-        {% else %}
-            <li><a href="{{ pathto(master_doc) }}">{{ master_doc_short_name }}</a></li>
-        {% endif %}
+        <li><a href="{{ parent.link|e }}">{{ parent.title }}</a></li>
     {% endfor %}
     <li class="active"><a href="#">{{ meta.get('main-title', title) }}</a></li>
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+<!-- VFE TODO integrate "next" page logic to allow better navigation -->
diff --git a/developer/index.rst b/developer/index.rst
index 3bc597371..5b84c98c8 100644
--- a/developer/index.rst
+++ b/developer/index.rst
@@ -1,8 +1,9 @@
 :banner: banners/index.jpg
+:show_main_toc_link:
 
-============================
-Odoo Developer Documentation
-============================
+=======================
+Developer Documentation
+=======================
 
 .. todo:: what's the documentation's license?
 
diff --git a/user/index.rst b/user/index.rst
index 5f91a0c9e..89b63290c 100644
--- a/user/index.rst
+++ b/user/index.rst
@@ -1,8 +1,9 @@
 :banners-display:
+:show_main_toc_link:
 
-=======================
-Odoo User Documentation
-=======================
+==================
+User Documentation
+==================
 
 .. VFE FIXME what is the logic behind index-tree ?