diff --git a/swh/web/templates/browse/branches.html b/swh/web/templates/browse/branches.html
index 6aee7a0a4..9a81c4a94 100644
--- a/swh/web/templates/browse/branches.html
+++ b/swh/web/templates/browse/branches.html
@@ -1,58 +1,58 @@
 {% extends "./browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
 {% if displayed_branches|length > 0 %}
   <div class="table-responsive mt-3 mb-3">
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
-          <th><i class="{{ swh_object_icons|key_value:'branch' }} fa-fw"></i>Name</th>
+          <th><i class="{{ swh_object_icons.branch }} fa-fw"></i>Name</th>
           <th>Revision</th>
           <th>Message</th>
           <th>Date</th>
         </tr>
       </thead>
       <tbody>
         {% for branch in displayed_branches %}
           <tr class="swh-origin-branch">
-            <td style="max-width: 300px"><i class="{{ swh_object_icons|key_value:'branch' }} fa-fw"></i><a href="{{ branch.directory_url }}">{{ branch.name }}</a></td>
+            <td style="max-width: 300px"><i class="{{ swh_object_icons.branch }} fa-fw"></i><a href="{{ branch.directory_url }}">{{ branch.name }}</a></td>
             <td><a href="{{ branch.revision_url }}">{{ branch.revision|slice:":7" }}</a></td>
             <td class="swh-log-entry-message swh-table-cell-text-overflow" style="min-width: 500px" title="{{ branch.message }}">{{ branch.message }}</td>
             <td style="min-width: 250px">{{ branch.date }}</td>
           </tr>
         {% endfor %}
       </tbody>
     </table>
   </div>
 {% else %}
   <i>The list of branches is empty !</i>
 {% endif %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if prev_branches_url or next_branches_url %}
   <ul class="pagination justify-content-center">
     {% if prev_branches_url %}
       <li class="page-item"><a class="page-link" href="{{ prev_branches_url }}">Previous</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Previous</a></li>
     {% endif %}
 
     {% if next_branches_url %}
       <li class="page-item"><a class="page-link" href="{{ next_branches_url }}">Next</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Next</a></li>
     {% endif %}
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/release.html b/swh/web/templates/browse/release.html
index 45c04da95..4ad28aeb1 100644
--- a/swh/web/templates/browse/release.html
+++ b/swh/web/templates/browse/release.html
@@ -1,25 +1,25 @@
 {% extends "./browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
 {% include "includes/top-navigation.html" %}
 <div style="height: 35px;margin: 4px;">
-  <i class="{{ swh_object_icons|key_value:'release' }} fa-fw"></i>Release <b>{{ swh_object_metadata.name }}</b>
+  <i class="{{ swh_object_icons.release }} fa-fw"></i>Release <b>{{ swh_object_metadata.name }}</b>
   created by {{ swh_object_metadata.author }} on <b>{{ swh_object_metadata.date }}</b>
 </div>
 <pre style="white-space: pre-wrap">
 <h6>{{ release.note_header }}</h6>{{ release.note_body }}
 </pre>
 <div style="margin: 4px;">
   <b>Target:</b> <i class="{{ swh_object_icons|key_value:release.target_type }} fa-fw"></i>
   <a href="{{ release.target_url}}">{{ release.target }}</a>
 </div>
 {% endblock %}
diff --git a/swh/web/templates/browse/releases.html b/swh/web/templates/browse/releases.html
index 3ea848e50..628f3be87 100644
--- a/swh/web/templates/browse/releases.html
+++ b/swh/web/templates/browse/releases.html
@@ -1,57 +1,57 @@
 {% extends "./browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
 {% if displayed_releases|length > 0 %}
   <div class="table-responsive mt-3 mb-3">
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
-          <th><i class="{{ swh_object_icons|key_value:'release' }} fa-fw"></i>Name</th>
+          <th><i class="{{ swh_object_icons.release }} fa-fw"></i>Name</th>
           <th>Target</th>
           <th>Message</th>
           <th>Date</th>
         </tr>
       </thead>
       <tbody>
         {% for release in displayed_releases %}
           <tr class="swh-origin-release">
-            <td><i class="{{ swh_object_icons|key_value:'release' }} fa-fw"></i><a href="{{ release.release_url }}">{{ release.name }}</a></td>
+            <td><i class="{{ swh_object_icons.release }} fa-fw"></i><a href="{{ release.release_url }}">{{ release.name }}</a></td>
             <td><i class="{{ swh_object_icons|key_value:release.target_type }} fa-fw"></i><a href="{{ release.target_url }}">{{ release.target|slice:":7" }}</a></td>
             <td class="swh-log-entry-message swh-table-cell-text-overflow" title="{{ release.message }}">{{ release.message }}</td>
             <td>{{ release.date }}</td>
           </tr>
         {% endfor %}
       </tbody>
     </table>
   </div>
 {% else %}
   <i>The list of releases is empty !</i>
 {% endif %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if prev_releases_url or next_releases_url %}
   <ul class="pagination justify-content-center">
     {% if prev_releases_url %}
       <li class="page-item"><a class="page-link" href="{{ prev_releases_url }}">Previous</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Previous</a></li>
     {% endif %}
 
     {% if next_releases_url %}
       <li class="page-item"><a class="page-link" href="{{ next_releases_url }}">Next</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Next</a></li>
     {% endif %}
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/revision-log.html b/swh/web/templates/browse/revision-log.html
index 9d89811af..cf7cbd40d 100644
--- a/swh/web/templates/browse/revision-log.html
+++ b/swh/web/templates/browse/revision-log.html
@@ -1,68 +1,68 @@
 {% extends "./browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load render_bundle from webpack_loader %}
 {% load swh_templatetags %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
 {% block swh-browse-content %}
 {% if snapshot_context %}
   {% include "includes/top-navigation.html" %}
 {% endif %}
 
 {% if snapshot_context and snapshot_context.is_empty %}
   {% include "includes/empty-snapshot.html" %}
 {% else %}
   <div class="table-responsive mb-3">
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
-          <th><i class="{{ swh_object_icons|key_value:'revision' }} fa-fw"></i>Revision</th>
+          <th><i class="{{ swh_object_icons.revision }} fa-fw"></i>Revision</th>
           <th>Author</th>
           <th>Message</th>
           <th>Date</th>
           <th></th>
         </tr>
       </thead>
       <tbody>
         {% for log in revision_log %}
           <tr class="swh-revision-log-entry">
-            <td class="swh-revision-log-entry-id"><i class="{{ swh_object_icons|key_value:'revision' }} fa-fw"></i>{{ log.revision }}</td>
+            <td class="swh-revision-log-entry-id"><i class="{{ swh_object_icons.revision }} fa-fw"></i>{{ log.revision }}</td>
             <td class="swh-revision-log-entry-author">{{ log.author }}</td>
             <td class="swh-log-entry-message swh-table-cell-text-overflow" title="{{ log.message }}">{{ log.message }}</td>
             <td class="swh-revision-log-entry-date">{{ log.date }}</td>
             <td>{{ log.directory }}</td>
           </tr>
         {% endfor %}
       </tbody>
     </table>
   </div>
 {% endif %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if not snapshot_context or not snapshot_context.is_empty %}
   <ul class="pagination justify-content-center">
     {% if next_log_url %}
       <li class="page-item"><a class="page-link" href="{{ next_log_url }}">Newer</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Newer</a></li>
     {% endif %}
     {% if prev_log_url %}
       <li class="page-item"><a class="page-link" href="{{ prev_log_url }}">Older</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Older</a></li>
     {% endif %}
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/revision.html b/swh/web/templates/browse/revision.html
index d4153e7ee..dc6cb0041 100644
--- a/swh/web/templates/browse/revision.html
+++ b/swh/web/templates/browse/revision.html
@@ -1,110 +1,110 @@
 {% extends "./browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load static %}
 {% load swh_templatetags %}
 {% load render_bundle from webpack_loader %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
 {% block swh-browse-content %}
 <div>
-  <i class="{{ swh_object_icons|key_value:'revision' }} fa-fw"></i>Revision <b>{{ swh_object_metadata.id }}</b>
+  <i class="{{ swh_object_icons.revision }} fa-fw"></i>Revision <b>{{ swh_object_metadata.id }}</b>
   authored by {{ swh_object_metadata.author }} on <b>{{ swh_object_metadata.date }}</b>
 </div>
 
 <div class="card">
   <div class="card-header bg-gray-light border-bottom-0" style="padding-left: 9.5px;">
     <a data-toggle="collapse" id="swh-collapse-revision-message" href="#swh-revision-message">
       <div class="float-left">
         <pre style="white-space: pre-wrap; background-color: inherit; padding: 0px; margin: 0px; border: none;"><h5 style="padding-bottom: 0px; font-weight: normal;">{{ message_header }}</h5></pre>
       </div>
       <div class="clearfix"></div>
     </a>
   </div>
   {% if message_body %}
     <div id="swh-revision-message" class="collapse show">
       <pre style="white-space: pre-wrap; margin: 0px; border: none; border-radius: 0px;">{{ message_body }}</pre>
     </div>
   {% endif %}
 </div>
 
 <div style="margin: 4px; padding-bottom: 5px;">
   <b>{{ parents|length }} parent{% if parents|length > 1 %}s{% endif %}</b>
-  <i class="{{ swh_object_icons|key_value:'revision' }} fa-fw"></i>
+  <i class="{{ swh_object_icons.revision }} fa-fw"></i>
   {% for parent in parents %}
     <a href="{{ parent.url }}">{{ parent.id|slice:":7" }}</a>
     {% if not forloop.last %}
       +
     {% endif %}
   {% endfor %}
 </div>
 
 <ul class="nav nav-tabs" style="padding-left: 5px;">
   <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#swh-revision-tree">Files</a></li>
   <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#swh-revision-changes">Changes</a></li>
 </ul>
 
 <div class="tab-content">
   <div id="swh-revision-tree" class="tab-pane active">
     {% include "includes/top-navigation.html" %}
     {% if content_size %}
       {% include "includes/content-display.html" %}
     {% else %}
       {% include "includes/directory-display.html" %}
     {% endif %}
   </div>
 
   <div id="swh-revision-changes" class="tab-pane">
     <div id="swh-too-large-revision-diff" class="alert alert-warning" role="alert" style="display: none; margin: 5px 5px 0px 5px">
       The diff you're trying to view is too large. Only the first <span id="swh-nb-loaded-diffs">1000</span> changed files have been loaded.
     </div>
     <div id="swh-revision-diffs" style="padding: 5px; padding-bottom: 0;">
       <div class="card">
         <div class="card-header bg-gray-light border-bottom-0">
           <a data-toggle="collapse" href="#swh-revision-changes-list">
             <div class="float-left">
               Showing <strong id="swh-revision-changed-files"></strong>
               with <strong id="swh-revision-lines-added" style="color:green">0 additions</strong>
               and <strong id="swh-revision-lines-deleted" style="color:red">0 deletions</strong>
               (<span id="swh-nb-diffs-computed">0</span> / <span id="swh-total-nb-diffs">0</span> diffs computed)
             </div>
             <div class="float-right">
               <button class="btn btn-default btn-sm" type="button" onclick="swh.revision.computeAllDiffs(event)" id="swh-compute-all-diffs"
                       title="By default, diffs will be computed as the view is scrolled.
 Pushing that button will request the immediate computation of all diffs." style="visibility: hidden;">Compute all diffs</button>
             </div>
             <div class="clearfix"></div>
           </a>
         </div>
         <div id="swh-revision-changes-list" class="collapse show">
           <div id="swh-revision-changes-loading" class="text-center">
             <img src="{% static "img/swh-spinner.gif" %}"></img>
             <p>Computing file changes ...</p>
           </div>
           <pre style="background: none; border: none; display: none;"></pre>
         </div>
       </div>
     </div>
   </div>
 </div>
 
 <script>
   var revMsgBody = {{ message_body|jsonify }};
   var diffRevUrl = {{ diff_revision_url|jsonify }};
   swh.revision.initRevisionDiff(revMsgBody, diffRevUrl);
 </script>
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% include "includes/readme-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/includes/snapshot-context.html b/swh/web/templates/includes/snapshot-context.html
index 3370e61bb..49d8ca7cf 100644
--- a/swh/web/templates/includes/snapshot-context.html
+++ b/swh/web/templates/includes/snapshot-context.html
@@ -1,31 +1,31 @@
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 <hr class="mt-1 mb-1">
 <div class="swh-origin-visit-details">
   <ul>
     {% if snapshot_context.origin_info %}
-      <li><i class="{{ swh_object_icons|key_value:'visits' }} fa-fw"></i><a href="{{ snapshot_context.browse_url }}">Visits</a></li>
+      <li><i class="{{ swh_object_icons.visits }} fa-fw"></i><a href="{{ snapshot_context.browse_url }}">Visits</a></li>
     {% endif %}
     {% if snapshot_context.visit_info %}
-      <li><i class="{{ swh_object_icons|key_value:'snapshot' }} fa-fw"></i> Snapshot date: <a href="{{ snapshot_context.visit_info.url }}">{{ snapshot_context.visit_info.fmt_date }}</a></li>
+      <li><i class="{{ swh_object_icons.snapshot }} fa-fw"></i> Snapshot date: <a href="{{ snapshot_context.visit_info.url }}">{{ snapshot_context.visit_info.fmt_date }}</a></li>
     {% endif %}
     {% if not snapshot_context.snapshot_size.revision %}
-      <li><i class="{{ swh_object_icons|key_value:'branches' }} fa-fw"></i> Branches (0)</li>
+      <li><i class="{{ swh_object_icons.branches }} fa-fw"></i> Branches (0)</li>
     {% else %}
-      <li><i class="{{ swh_object_icons|key_value:'branches' }} fa-fw"></i> <a href="{{ snapshot_context.branches_url }}">Branches ({{ snapshot_context.snapshot_size.revision}})</a></li>
+      <li><i class="{{ swh_object_icons.branches }} fa-fw"></i> <a href="{{ snapshot_context.branches_url }}">Branches ({{ snapshot_context.snapshot_size.revision}})</a></li>
     {% endif %}
     {% if not snapshot_context.snapshot_size.release %}
-      <li><i class="{{ swh_object_icons|key_value:'releases' }} fa-fw"></i> Releases (0)</li>
+      <li><i class="{{ swh_object_icons.releases }} fa-fw"></i> Releases (0)</li>
     {% else %}
-      <li><i class="{{ swh_object_icons|key_value:'releases' }} fa-fw"></i> <a href="{{ snapshot_context.releases_url }}">Releases ({{ snapshot_context.snapshot_size.release }})</a></li>
+      <li><i class="{{ swh_object_icons.releases }} fa-fw"></i> <a href="{{ snapshot_context.releases_url }}">Releases ({{ snapshot_context.snapshot_size.release }})</a></li>
     {% endif %}
   </ul>
 </div>
 <hr class="mt-1 mb-1">
\ No newline at end of file
diff --git a/swh/web/templates/includes/top-navigation.html b/swh/web/templates/includes/top-navigation.html
index ea928f865..5966fe08b 100644
--- a/swh/web/templates/includes/top-navigation.html
+++ b/swh/web/templates/includes/top-navigation.html
@@ -1,125 +1,125 @@
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 <div class="swh-browse-top-navigation">
   {% if snapshot_context %}
     {% if snapshot_context.branch or snapshot_context.release %}
       <div class="dropdown float-left" id="swh-branches-releases-dd">
         <button class="btn btn-block btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
           {% if snapshot_context.branch %}
-            <i class="{{ swh_object_icons|key_value:'branch' }} fa-fw" aria-hidden="true"></i>
+            <i class="{{ swh_object_icons.branch }} fa-fw" aria-hidden="true"></i>
             Branch: <strong>{{ snapshot_context.branch }}</strong>
           {% else %}
-            <i class="{{ swh_object_icons|key_value:'release' }} fa-fw" aria-hidden="true"></i>
+            <i class="{{ swh_object_icons.release }} fa-fw" aria-hidden="true"></i>
             Release: <strong>{{ snapshot_context.release }}</strong>
           {% endif %}
           <span class="caret"></span>
         </button>
         <ul class="scrollable-menu dropdown-menu swh-branches-releases">
           <ul class="nav nav-tabs">
             <li class="nav-item"><a class="nav-link active swh-branches-switch" data-toggle="tab">Branches</a></li>
             <li class="nav-item"><a class="nav-link swh-releases-switch" data-toggle="tab">Releases</a></li>
           </ul>
           <div class="tab-content">
             <div class="tab-pane active" id="swh-tab-branches">
               {% for b in snapshot_context.branches %}
                 <li class="swh-branch">
                   <a href="{{ b.url | safe }}">
-                    <i class="{{ swh_object_icons|key_value:'branch' }} fa-fw" aria-hidden="true"></i>
+                    <i class="{{ swh_object_icons.branch }} fa-fw" aria-hidden="true"></i>
                     {% if b.name == snapshot_context.branch %}
                       <i class="fa fa-check fa-fw" aria-hidden="true"></i>
                     {% else %}
                       <i class="fa fa-fw" aria-hidden="true"></i>
                     {% endif %}
                     {{ b.name }}
                   </a>
                 </li>
               {% endfor %}
               {% if snapshot_context.branches|length < snapshot_context.snapshot_size.revision %}
                 <li>
                   <i class="fa fa-warning fa-fw" aria-hidden="true"></i>
                   Branches list truncated to {{ snapshot_context.branches|length }} entries,
                   {{ snapshot_context.branches|length|mul:-1|add:snapshot_context.snapshot_size.revision }}
                   were omitted.
                 </li>
               {% endif %}
             </div>
             <div class="tab-pane" id="swh-tab-releases">
               {% if snapshot_context.releases %}
                 {% for r in snapshot_context.releases %}
                   {% if r.target_type == 'revision' %}
                     <li class="swh-release">
                       <a href="{{ r.url | safe }}">
-                        <i class="{{ swh_object_icons|key_value:'release' }} fa-fw" aria-hidden="true"></i>
+                        <i class="{{ swh_object_icons.release }} fa-fw" aria-hidden="true"></i>
                         {% if r.name == snapshot_context.release %}
                           <i class="fa fa-check fa-fw" aria-hidden="true"></i>
                         {% else %}
                           <i class="fa fa-fw" aria-hidden="true"></i>
                         {% endif %}
                         {{ r.name }}
                       </a>
                     </li>
                   {% endif %}
                 {% endfor %}
                 {% if snapshot_context.releases|length < snapshot_context.snapshot_size.release %}
                 <li>
                   <i class="fa fa-warning fa-fw" aria-hidden="true"></i>
                   Releases list truncated to {{ snapshot_context.releases|length }} entries,
                   {{ snapshot_context.releases|length|mul:-1|add:snapshot_context.snapshot_size.release }}
                   were omitted.
                 </li>
               {% endif %}
               {% else %}
                 <span>No releases to show</span>
               {% endif %}
             </div>
           </div>
         </ul>
       </div>
     {% endif %}
   {% endif %}
 
   <div class="btn-group float-right swh-actions-dropdown">
     {% if top_right_link %}
       <a href="{{ top_right_link.url | safe }}" class="btn btn-default btn-sm" role="button">
         {% if top_right_link.icon %}
           <i class="{{ top_right_link.icon }} fa-fw"></i>
         {% endif %}
         {{ top_right_link.text }}
       </a>
     {% endif %}
     {% if show_actions_menu %}
       <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
         <i class="fa fa-bars fa-fw" aria-hidden="true"></i>Actions
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu dropdown-menu-right swh-browse-actions-menu">
         {% if not snapshot_context or not snapshot_context.is_empty %}
           {% include "includes/vault-create-tasks.html" %}
         {% endif %}
         {% include "includes/show-metadata.html" %}
       </ul>
     {% endif %}
   </div>
 
   {% include "includes/breadcrumbs.html" %}
 
 </div>
 
 {% include "includes/show-swh-ids.html" %}
 
 <script>
   var snapshotContext = false;
   var branch = false;
   {% if snapshot_context %}
     snapshotContext = true;
     branch = {{ snapshot_context.branch|jsonify }};
   {% endif %}
   swh.browse.initSnapshotNavigation(snapshotContext, branch);
 </script>
diff --git a/swh/web/templates/includes/vault-create-tasks.html b/swh/web/templates/includes/vault-create-tasks.html
index 24e6672c3..81f0de4c9 100644
--- a/swh/web/templates/includes/vault-create-tasks.html
+++ b/swh/web/templates/includes/vault-create-tasks.html
@@ -1,118 +1,118 @@
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% if vault_cooking %}
 
   <!-- entry in the Actions menu -->
   <div class="dropdown-submenu swh-vault-menu">
     <a class="dropdown-item dropdown-left" tabindex="-1" href="#">
       <i class="fa fa-download fa-fw" aria-hidden="true"></i>Download
     </a>
     <div class="dropdown-menu">
       {% if vault_cooking.directory_context %}
         <button class="dropdown-item" type="button" tabindex="-1" data-toggle="modal" data-target="#vault-cook-directory-modal">
-          <i class="{{ swh_object_icons|key_value:'directory' }} fa-fw" aria-hidden="true"></i>Directory
+          <i class="{{ swh_object_icons.directory }} fa-fw" aria-hidden="true"></i>Directory
         </button>
       {% endif %}
       {% if vault_cooking.revision_context %}
         <button class="dropdown-item" type="button" tabindex="-1" data-toggle="modal" data-target="#vault-cook-revision-modal">
-          <i class="{{ swh_object_icons|key_value:'revision' }} fa-fw"></i>Revision
+          <i class="{{ swh_object_icons.revision }} fa-fw"></i>Revision
         </button>
       {% endif %}
     </div>
   </div>
 
   <!-- modals related to the creation of vault cooking tasks -->
   <!-- they will be reparented in the script below in order to be able to display them -->
   <div class="modal fade" id="vault-cook-directory-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-directory-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-cook-directory-modal-label">Cook and download a directory from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the directory with identifier <strong>{{ vault_cooking.directory_id }}</strong>
             into a standard tar.gz archive.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-directory-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.cookDirectoryArchive('{{ vault_cooking.directory_id }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="vault-cook-revision-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-revision-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-cook-revision-modal-label">Cook and download a revision from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the revision with identifier <strong>{{ vault_cooking.revision_id }}</strong>
             into a git fast-import archive.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-revision-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.cookRevisionArchive('{{ vault_cooking.revision_id }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="invalid-email-modal" tabindex="-1" role="dialog" aria-labelledby="invalid-email-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <h4 class="modal-title" id="invalid-email-modal-label">Invalid Email !</h4>
         </div>
         <div class="modal-body">
           <p>The provided email is not well-formed.</p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <script>
     swh.vault.initTaskCreationUi();
   </script>
 
 {% endif %}
\ No newline at end of file