diff --git a/swh/web/templates/content.html b/swh/web/templates/content.html
index 51cfd14e0..b229c936d 100644
--- a/swh/web/templates/content.html
+++ b/swh/web/templates/content.html
@@ -1,48 +1,48 @@
 {% extends "layout.html" %}
 {% load static %}
 
 {% block header %}
 <script src="{% static 'js/highlightjs/dist/highlight.pack.js' %}"></script>
 <script src="{% static 'js/highlightjs-line-numbers/dist/highlightjs-line-numbers.min.js' %}"></script>
 <script>
   // empty hljs language definition
   function no_highlight(hljs) {
     return {}
   }
   // just a trick to get line numbers working when no highlight
   // has to be performed
   hljs.registerLanguage('nohighlight-swh', no_highlight);
   hljs.initHighlightingOnLoad();
   hljs.initLineNumbersOnLoad();
 </script>
 <link rel="stylesheet" href="{% static 'css/highlightjs/github.css' %}">  
 {% endblock %}
 
 {% block title %}Content display{% endblock %}
 
 {% block content %}
 
 <div class="well well-sm">
   <b>Content mime type:</b> {{ mime_type }} , <b>Hashing algorithm:</b> {{ content_hash_algo}} , <b>Content checksum:</b> {{ content_checksum }} 
   <a href="{{ content_raw_url }}" class="btn btn-link btn-xs navbar-right" role="button">Raw File</a>
 </div>
 
-{% include "content-directory-top-navigation.html" %}
+{% include "includes/top-navigation.html" %}
 
 <div class="well well-sm">
 {% if "inode/x-empty" == mime_type %}
 <i>File is empty</i>
 {% elif "text/" in mime_type %}
 <div class="highlightjs">
   <pre>
     <code class="{{ language }}">{{ content }}</code>
   </pre>
 </div>
 {% elif "image/" in mime_type and content %}
   <img src="data:{{ mime_type }};base64,{{ content }}"/>
 {% else %}
 Content with mime type {{ mime_type }} can not be displayed
 {% endif %}
 </div>
 
 {% endblock %}
diff --git a/swh/web/templates/directory.html b/swh/web/templates/directory.html
index 1414a39ad..93ae0e92a 100644
--- a/swh/web/templates/directory.html
+++ b/swh/web/templates/directory.html
@@ -1,47 +1,47 @@
 {% extends "layout.html" %}
 {% block title %}Directory browse{% endblock %}
 {% block content %}
 
 <div class="well well-sm">
     <b>Directory sha1 git:</b> {{ dir_sha1_git }}
 </div>
 
-{% include "content-directory-top-navigation.html" %}
+{% include "includes/top-navigation.html" %}
 
 <div class="table-responsive">
   <table class="table">
     <thead>
       <tr>
         <th>File</th>
         <th>Mode</th>
         <th>Size</th>
         <th>Sha1 git</th>
       </tr>
     </thead>
     <tbody>
       {% for d in dirs %}
       <tr>
         <td class="swh-directory">
           <i class="fa fa-folder fa-fw" aria-hidden="true"></i>
           <a href="{{ d.url }}">{{ d.name }}</a>
         </td>
         <td>{{ d.perms }}</td>
         <td></td>
         <td>{{ d.target }}</td>
       </tr>
       {% endfor %}
       {% for f in files %}
       <tr>
         <td class="swh-content">
           <i class="fa fa-file-text fa-fw" aria-hidden="true"></i>
           <a href="{{ f.url }}">{{ f.name }}</a>
         </td>
         <td>{{ f.perms }}</td>
         <td>{{ f.length }}</td>
         <td>{{ f.target }}</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 {% endblock %}
diff --git a/swh/web/templates/content-directory-top-navigation.html b/swh/web/templates/includes/top-navigation.html
similarity index 100%
rename from swh/web/templates/content-directory-top-navigation.html
rename to swh/web/templates/includes/top-navigation.html