diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 209288f67a..6f7a9eae38 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -186,26 +186,7 @@
             <div class="PNB wrapper">
                 <div class="tabs ui-tabs">
                     <div id="retractableButton"></div>
-                    <ul class="icon-menu ui-tabs-nav ui-helper-reset">
-                        {% if GV_thesaurus %}
-                        <li class="proposals_WZ">
-                            <a href="#proposals" class="WZtabs">
-                                <img class="proposals_off" src="/skins/icons/proposition_off32.png" title="{{ 'phraseanet:: propositions' | trans }}"/>
-                                <img class="proposals_on" src="/skins/icons/proposition_on32.png" title="{{ 'phraseanet:: propositions' | trans }}"/>
-                            </a>
-                        </li>
-                        <li class="thesaurus">
-                            <a href="#thesaurus_tab" class="WZtabs">
-                                <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
-                            </a>
-                        </li>
-                        {% endif %}
-                        <li class="ui-tabs-selected ui-corner-top baskets">
-                            <a href="#baskets" class="WZbasketTab">
-                                <div id="basket_menu_trigger">&#9660;</div>
-                            </a>
-                        </li>
-                    </ul>
+                    {% include 'prod/tab_headers.html.twig' %}
                     <div id="baskets" class="PNB">
                         {% import 'prod/WorkZone/Macros.html.twig'  as  WorkZoneMacros %}
                         {{WorkZoneMacros.make_bloc(app, WorkZone)}}
@@ -215,73 +196,7 @@
                         ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
                         <button id="facets-back-btn" style="display:none;">back</button>
                     </div>
-                    <div id="thesaurus_tab" class="PNB" style="top:66px;">
-                        <div id="THPD_tabs">
-                            <ul>
-                                <li class="th_tab"><a href="#THPD_T"><span>{{ 'prod::thesaurusTab:thesaurus' | trans }}</span></a></li>
-                                {% if app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus') %}
-                                    <li class="th_tab"><a href="#THPD_C"><span>{{ 'prod::thesaurusTab:candidats' | trans }}</span></a></li>
-                                {% endif %}
-                            </ul>
-                            <div class="ui-tabs-panels-container">
-                                <div id="THPD_T">
-                                    <div id='THPD_WIZARDS' style="position:relative; top:0px; left:0px; height:auto; width:100%;">
-                                        <div class="wizard wiz_0">
-                                            <!-- empty wizard -->
-                                        </div>
-                                        <div class="wizard wiz_1" style="display:none">
-                                            <div class="txt">{{ 'prod::thesaurusTab:wizard:accepter le terme candidat' | trans }}</div>
-                                        </div>
-                                        <div class="wizard wiz_2" style="display:none">
-                                            <div class="txt">{{ 'prod::thesaurusTab:wizard:remplacer par le terme' | trans }}</div>
-                                        </div>
-                                        <form class="gform form-inline" onsubmit="T_Gfilter(this);return(false);">
-                                            <div class="input-append">
-                                                <input type="text" name="search_value" class="input-medium" onkeyup="T_Gfilter_delayed(this.value, 300);" />
-                                                <input type="submit" class="th_ok btn" value="" />
-                                                <input type="button" class="th_clear"/>
-                                                <input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}" onclick="thesauCancelWizard();return(false);"/>
-                                             </div>
-                                        </form>
-                                    </div>
-                                    <div id='THPD_T_treeBox' class="searchZone" style="position:absolute; top:45px; bottom:0px; left:0px; width:100%;">
-                                        <div onclick="Xclick(event);return(false);" ondblclick="TXdblClick(event);">
-                                            <ul class="treeview" id="THPD_T_tree">
-                                                {% for base in search_datas['bases'] %}
-                                                    {% if base['thesaurus'] %}
-                                                    <li id="TX_P.{{base['sbas_id']}}.T" class="expandable{% if loop.last %} last{% endif %}">
-                                                        <div class="hitarea expandable-hitarea"></div>
-                                                        <span>{{base['sbas_id']|sbas_labels(app)}}</span>
-                                                        <ul style="display:none">{{ 'chargement' | trans }}</ul>
-                                                    </li>
-                                                    {% endif %}
-                                                {% endfor %}
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                                {% if app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus') %}
-                                <div id="THPD_C">
-                                    <div id='THPD_C_treeBox' class="searchZone">
-                                        <div onclick="Xclick(event);return(false);" ondblclick="CXdblClick(event);">
-                                            <ul class="treeview" id="THPD_C_tree">
-                                                {% for base in search_datas['bases'] %}
-                                                    {% if base['cterms'] %}
-                                                    <li id="CX_P.{{base['sbas_id']}}.C" class="expandable{% if loop.last %} last{% endif %}">
-                                                        <div class="hitarea expandable-hitarea"></div>
-                                                        <span>{{base['sbas_id']|sbas_labels(app)}}</span>
-                                                        <ul style="display:none">{{ 'chargement' | trans }}</ul>
-                                                    </li>
-                                                    {% endif %}
-                                                {% endfor %}
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
+                    {% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app['acl'].get(app['authentication'].getUser()).has_access_to_module('thesaurus')} %}
                     {% endif %}
                 </div>
             </div>
diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig
new file mode 100644
index 0000000000..7988a27a60
--- /dev/null
+++ b/templates/web/prod/tab_headers.html.twig
@@ -0,0 +1,24 @@
+{% block tab_headers %}
+    <ul class="icon-menu ui-tabs-nav ui-helper-reset">
+        {% if GV_thesaurus %}
+            <li class="proposals_WZ">
+                <a href="#proposals" class="WZtabs">
+                    <img class="proposals_off" src="/skins/icons/proposition_off32.png"
+                         title="{{ 'phraseanet:: propositions' | trans }}"/>
+                    <img class="proposals_on" src="/skins/icons/proposition_on32.png"
+                         title="{{ 'phraseanet:: propositions' | trans }}"/>
+                </a>
+            </li>
+            <li class="thesaurus">
+                <a href="#thesaurus_tab" class="WZtabs">
+                    <img src="/skins/icons/thesaurus_32.png" title="{{ 'phraseanet:: thesaurus' | trans }}"/>
+                </a>
+            </li>
+        {% endif %}
+        <li class="ui-tabs-selected ui-corner-top baskets">
+            <a href="#baskets" class="WZbasketTab">
+                <div id="basket_menu_trigger">&#9660;</div>
+            </a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/templates/web/prod/tab_thesaurus.html.twig b/templates/web/prod/tab_thesaurus.html.twig
new file mode 100644
index 0000000000..cc3c49be08
--- /dev/null
+++ b/templates/web/prod/tab_thesaurus.html.twig
@@ -0,0 +1,74 @@
+{% block tab_thesaurus %}
+    <div id="thesaurus_tab" class="PNB" style="top:66px;">
+        <div id="THPD_tabs">
+            <ul>
+                <li class="th_tab"><a href="#THPD_T"><span>{{ 'prod::thesaurusTab:thesaurus' | trans }}</span></a></li>
+                {% if has_access_to_module %}
+                    <li class="th_tab"><a href="#THPD_C"><span>{{ 'prod::thesaurusTab:candidats' | trans }}</span></a></li>
+                {% endif %}
+            </ul>
+            <div class="ui-tabs-panels-container">
+                <div id="THPD_T">
+                    <div id='THPD_WIZARDS' style="position:relative; top:0px; left:0px; height:auto; width:100%;">
+                        <div class="wizard wiz_0">
+                            <!-- empty wizard -->
+                        </div>
+                        <div class="wizard wiz_1" style="display:none">
+                            <div class="txt">{{ 'prod::thesaurusTab:wizard:accepter le terme candidat' | trans }}</div>
+                        </div>
+                        <div class="wizard wiz_2" style="display:none">
+                            <div class="txt">{{ 'prod::thesaurusTab:wizard:remplacer par le terme' | trans }}</div>
+                        </div>
+                        <form class="gform form-inline" onsubmit="T_Gfilter(this);return(false);">
+                            <div class="input-append">
+                                <input type="text" name="search_value" class="input-medium"
+                                       onkeyup="T_Gfilter_delayed(this.value, 300);"/>
+                                <input type="submit" class="th_ok btn" value=""/>
+                                <input type="button" class="th_clear"/>
+                                <input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}"
+                                       onclick="thesauCancelWizard();return(false);"/>
+                            </div>
+                        </form>
+                    </div>
+                    <div id='THPD_T_treeBox' class="searchZone"
+                         style="position:absolute; top:45px; bottom:0px; left:0px; width:100%;">
+                        <div onclick="Xclick(event);return(false);" ondblclick="TXdblClick(event);">
+                            <ul class="treeview" id="THPD_T_tree">
+                                {% for base in search_datas['bases'] %}
+                                    {% if base['thesaurus'] %}
+                                        <li id="TX_P.{{ base['sbas_id'] }}.T"
+                                            class="expandable{% if loop.last %} last{% endif %}">
+                                            <div class="hitarea expandable-hitarea"></div>
+                                            <span>{{ base['sbas_id']|sbas_labels(app) }}</span>
+                                            <ul style="display:none">{{ 'chargement' | trans }}</ul>
+                                        </li>
+                                    {% endif %}
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                {% if has_access_to_module %}
+                    <div id="THPD_C">
+                        <div id='THPD_C_treeBox' class="searchZone">
+                            <div onclick="Xclick(event);return(false);" ondblclick="CXdblClick(event);">
+                                <ul class="treeview" id="THPD_C_tree">
+                                    {% for base in search_datas['bases'] %}
+                                        {% if base['cterms'] %}
+                                            <li id="CX_P.{{ base['sbas_id'] }}.C"
+                                                class="expandable{% if loop.last %} last{% endif %}">
+                                                <div class="hitarea expandable-hitarea"></div>
+                                                <span>{{ base['sbas_id']|sbas_labels(app) }}</span>
+                                                <ul style="display:none">{{ 'chargement' | trans }}</ul>
+                                            </li>
+                                        {% endif %}
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}