diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index ac7001dbcc..84ab930e7d 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -18,115 +18,115 @@
                 {% endif %}
             </span>
             </li>
-            <li class="show-menu" id="toggle-menu-main">
-                <img src="/assets/common/images/icons/menu-burger.png"/>
+            {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
+                <li class="show-menu" id="toggle-menu-main">
+                    <img src="/assets/common/images/icons/menu-burger.png"/>
 
-                <div id="nav_menu_container" class="desktopmenu">
-                    <div class="arrow-up"></div>
-                    <ol class="nav_menu">
-                        {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
-                            <li class="menu-bar-item">
-                                <a target="_blank" href="{{ path('prod') }}">
-                                    <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
-                                    <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
-                              {{ 'admin::monitor: production' | trans }}
-                            </span>
-                                </a>
-                            </li>
-
-                            {% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
+                    <div id="nav_menu_container" class="desktopmenu">
+                        <div class="arrow-up"></div>
+                        <ol class="nav_menu">
                                 <li class="menu-bar-item">
-                                    <a target="_blank" href="{{ path('thesaurus') }}">
-                                        <img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
-                                        <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
-                                      {{ 'admin::monitor: module thesaurus' | trans }}
-                                      </span>
+                                    <a target="_blank" href="{{ path('prod') }}">
+                                        <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
+                                        <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
+                                  {{ 'admin::monitor: production' | trans }}
+                                </span>
                                     </a>
                                 </li>
-                            {% endif %}
 
-
-                            {# MODULE #}
-                            {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
-                                <li class="menu-bar-item">
-                                    <a target="_blank" href="{{ path('admin') }}">
-                                        <img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
-                                        <span class="{% if module is defined and module == "admin" %}selected{% endif %}">
-                                        {{ 'admin::monitor: module admin' | trans }}
-                                      </span>
-                                    </a>
-                                </li>
-                            {% endif %}
-
-                            {# MODULE #}
-                            {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
-                                <li class="menu-bar-item">
-                                    <a target="_blank" href="{{ path('report_dashboard') }}">
-                                        <img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
-                                        <span class="{% if module is defined and module == "report" %}selected{% endif %}">
-                                        {{ 'admin::monitor: module report' | trans }}
-                                      </span>
-                                    </a>
-                                </li>
-                            {% endif %}
-
-                            {# MODULE #}
-                            <li class="menu-bar-item">
-                                <a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
-                                    <img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
-                                    <span>
-                                  {{ 'admin::monitor: module validation' | trans }}
-                                  </span>
-                                </a>
-                            </li>
-
-                            {# MODULE #}
-                            {% if module is defined and module == "prod" %}
-                                {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
+                                {% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
                                     <li class="menu-bar-item">
-                                        {% set link = path('upload_html5_form') %}
-
-                                        {% if not app['browser'].supportFileAPI() %}
-                                            {% set link = path('upload_flash_form') %}
-                                        {% endif %}
-
-                                        <a href="{{ link }}" class="uploader-open-action"
-                                           title="{{ 'Upload' | trans }}">
-                                            <img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
-                                            <span>
-                                            {{ 'admin::monitor: module upload' | trans }}
-                                        </span>
+                                        <a target="_blank" href="{{ path('thesaurus') }}">
+                                            <img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
+                                            <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
+                                          {{ 'admin::monitor: module thesaurus' | trans }}
+                                          </span>
                                         </a>
                                     </li>
                                 {% endif %}
-                            {% endif %}
 
-                            {# MODULE #}
-                            {% if module == "prod" %}
+
+                                {# MODULE #}
+                                {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
+                                    <li class="menu-bar-item">
+                                        <a target="_blank" href="{{ path('admin') }}">
+                                            <img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
+                                            <span class="{% if module is defined and module == "admin" %}selected{% endif %}">
+                                            {{ 'admin::monitor: module admin' | trans }}
+                                          </span>
+                                        </a>
+                                    </li>
+                                {% endif %}
+
+                                {# MODULE #}
+                                {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
+                                    <li class="menu-bar-item">
+                                        <a target="_blank" href="{{ path('report_dashboard') }}">
+                                            <img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
+                                            <span class="{% if module is defined and module == "report" %}selected{% endif %}">
+                                            {{ 'admin::monitor: module report' | trans }}
+                                          </span>
+                                        </a>
+                                    </li>
+                                {% endif %}
+
+                                {# MODULE #}
                                 <li class="menu-bar-item">
-                                    <a href="#" class="state-navigation" data-state="publication">
-                                        <img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
+                                    <a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
+                                        <img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
                                         <span>
-                                        {{ 'Publications' | trans }}
+                                      {{ 'admin::monitor: module validation' | trans }}
                                       </span>
                                     </a>
                                 </li>
-                            {% endif %}
 
-                            {% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
-                                <li class="menu-bar-item">
-                                    <a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
-                                  <span>
-                                    {{ 'Commandes' | trans }}
-                                  </span>
-                                    </a>
-                                </li>
-                            {% endif %}
+                                {# MODULE #}
+                                {% if module is defined and module == "prod" %}
+                                    {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
+                                        <li class="menu-bar-item">
+                                            {% set link = path('upload_html5_form') %}
 
-                        {% endif %}
-                    </ol>
-                </div>
-            </li>
+                                            {% if not app['browser'].supportFileAPI() %}
+                                                {% set link = path('upload_flash_form') %}
+                                            {% endif %}
+
+                                            <a href="{{ link }}" class="uploader-open-action"
+                                               title="{{ 'Upload' | trans }}">
+                                                <img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
+                                                <span>
+                                                {{ 'admin::monitor: module upload' | trans }}
+                                            </span>
+                                            </a>
+                                        </li>
+                                    {% endif %}
+                                {% endif %}
+
+                                {# MODULE #}
+                                {% if module == "prod" %}
+                                    <li class="menu-bar-item">
+                                        <a href="#" class="state-navigation" data-state="publication">
+                                            <img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
+                                            <span>
+                                            {{ 'Publications' | trans }}
+                                          </span>
+                                        </a>
+                                    </li>
+                                {% endif %}
+
+                                {% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
+                                    <li class="menu-bar-item">
+                                        <a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
+                                      <span>
+                                        {{ 'Commandes' | trans }}
+                                      </span>
+                                        </a>
+                                    </li>
+                                {% endif %}
+
+                        </ol>
+                    </div>
+                </li>
+            {% endif %}
             <li class="show-menu" id="toggle-menu-link">
                 <img src="/assets/common/images/icons/menu-web-site.png"/>
                 <div id="nav_customlink_container" class="mobile-link">
@@ -142,36 +142,27 @@
                     <div class="arrow-up"></div>
                     <div class="nav-wrapper-box">
                         <ol class="nav_menu">
-
-                            <li class="menu-bar-item">
-                                {% if app.getAuthenticator().isAuthenticated() %}
+                            {% if app.getAuthenticator().isAuthenticated() %}
+                                <li class="menu-bar-item">
                                     {% if app.getAuthenticatedUser().isGuest %}
                                         <img src="/assets/common/images/icons/menu-name-user.png"/>
-                                        <span>
-                {{ 'Guest' | trans }}
-              </span>
+                                        <span>{{ 'Guest' | trans }}</span>
                                     {% else %}
                                         <a target="_blank" href="{{ path('account') }}"
                                            title="{{ 'login:: Mon compte' | trans }}">
                                             <img src="/assets/common/images/icons/menu-name-user.png"/>
-                                            <span>
-                  {{ app.getAuthenticatedUser().getDisplayName() }}
-                </span>
+                                            <span>{{ app.getAuthenticatedUser().getDisplayName() }}</span>
                                         </a>
                                     {% endif %}
-                                {% endif %}
-                            </li>
-                            <li class="menu-bar-item">
-                                {% if app.getAuthenticator().isAuthenticated() %}
+                                </li>
+                                <li class="menu-bar-item">
                                     <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}"
                                        target="_self">
                                         <img src="/assets/common/images/icons/menu-logout.png"/>
-                                        <span>
-                  {{ 'phraseanet:: deconnection' | trans }}
-                </span>
+                                        <span>{{ 'phraseanet:: deconnection' | trans }}</span>
                                     </a>
-                                {% endif %}
-                            </li>
+                                </li>
+                            {% endif %}
                             <li class="menu-bar-item">
                                 <a target="_blank" href="https://docs.phraseanet.com/4.0/">
                                     <img src="/assets/common/images/icons/menu-help.png"/>