diff --git a/website/web/__init__.py b/website/web/__init__.py
index ce96adb9..a1bcfc6f 100644
--- a/website/web/__init__.py
+++ b/website/web/__init__.py
@@ -67,7 +67,7 @@ def sizeof_fmt(num, suffix='B'):
         if abs(num) < 1024.0:
             return "%3.1f%s%s" % (num, unit, suffix)
         num /= 1024.0
-    return "%.1f%s%s" % (num, 'Yi', suffix)
+    return ("%.1f%s%s" % (num, 'Yi', suffix)).strip()
 
 
 app.jinja_env.globals.update(sizeof_fmt=sizeof_fmt)
@@ -129,27 +129,27 @@ def urls_hostnode(tree_uuid: str, node_uuid: str):
 @app.route('/tree/<string:tree_uuid>/host/<string:node_uuid>', methods=['GET'])
 def hostnode_popup(tree_uuid: str, node_uuid: str):
     keys_response = {
-        'js': "/static/javascript.png",
-        'exe': "/static/exe.png",
-        'css': "/static/css.png",
-        'font': "/static/font.png",
-        'html': "/static/html.png",
-        'json': "/static/json.png",
-        'text': "/static/json.png",  # FIXME: Need new icon
-        'iframe': "/static/ifr.png",
-        'image': "/static/img.png",
-        'unset_mimetype': "/static/wtf.png",
-        'octet-stream': "/static/wtf.png",
-        'unknown_mimetype': "/static/wtf.png",
-        'video': "/static/video.png",
-        'livestream': "/static/video.png",
-        'response_cookie': "/static/cookie_received.png",
+        'js': {'icon': "javascript.png", 'tooltip': 'The content of the response is a javascript'},
+        'exe': {'icon': "exe.png", 'tooltip': 'The content of the response is an executable'},
+        'css': {'icon': "css.png", 'tooltip': 'The content of the response is a CSS'},
+        'font': {'icon': "font.png", 'tooltip': 'The content of the response is a font'},
+        'html': {'icon': "html.png", 'tooltip': 'The content of the response is a HTML document'},
+        'json': {'icon': "json.png", 'tooltip': 'The content of the response is a Json'},
+        'text': {'icon': "json.png", 'tooltip': 'The content of the response is a text'},  # FIXME: Need new icon
+        'iframe': {'icon': "ifr.png", 'tooltip': 'This content is loaded from an Iframe'},
+        'image': {'icon': "img.png", 'tooltip': 'The content of the response is an image'},
+        'unset_mimetype': {'icon': "wtf.png", 'tooltip': 'The type of content of the response is not set'},
+        'octet-stream': {'icon': "wtf.png", 'tooltip': 'The type of content of the response is a binary blob'},
+        'unknown_mimetype': {'icon': "wtf.png", 'tooltip': 'The type of content of the response is of an unknown type'},
+        'video': {'icon': "video.png", 'tooltip': 'The content of the response is a video'},
+        'livestream': {'icon': "video.png", 'tooltip': 'The content of the response is a livestream'},
+        'response_cookie': {'icon': "cookie_received.png", 'tooltip': 'There are cookies in the response'},
         # redirect has to be last
-        'redirect': "/static/redirect.png",
-        'redirect_to_nothing': "/static/cookie_in_url.png"
+        'redirect': {'icon': "redirect.png", 'tooltip': 'The request is redirected'},
+        'redirect_to_nothing': {'icon': "cookie_in_url.png", 'tooltip': 'The request is redirected to an URL we do not have in the capture'}
     }
     keys_request = {
-        'request_cookie': "/static/cookie_read.png",
+        'request_cookie': {'icon': "cookie_read.png", 'tooltip': 'There are cookies in the request'}
     }
 
     hostnode, urls = lookyloo.get_hostnode_investigator(tree_uuid, node_uuid)
diff --git a/website/web/templates/macros.html b/website/web/templates/macros.html
index 08b613b8..f0af7bb4 100644
--- a/website/web/templates/macros.html
+++ b/website/web/templates/macros.html
@@ -244,26 +244,36 @@
 
 {% macro popup_icons(lookup_dict, urlnode, tree_uuid) %}
 <div>
-{% for key, path in lookup_dict.items() %}
+{% for key, icon_info in lookup_dict.items() %}
   {% if urlnode[key] %}
     {% if key == "request_cookie" %}
-    <a href="{{ url_for('urlnode_request_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}" title="Download all the cookies in the request to the server">
-     <img src="{{ path }}" alt="{{ key }}" width="21" height="21"/>
+    <a href="{{ url_for('urlnode_request_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"
+       title="Download all the cookies in the request to the server">
+     <img src="{{ url_for('static', filename=icon_info['icon']) }}" alt="{{ icon_info['tooltip'] }}"
+          width="21" height="21"/>
     </a>
     {% elif key == "response_cookie"%}
-    <a href="{{ url_for('urlnode_response_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}" title="Download all the cookies in the response from the server">
-      <img src="{{ path }}" alt="{{ key }}" width="21" height="21"/>
+    <a href="{{ url_for('urlnode_response_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"
+       title="Download all the cookies in the response from the server">
+      <img src="{{ url_for('static', filename=icon_info['icon']) }}" alt="{{ icon_info['tooltip'] }}"
+           width="21" height="21"/>
     </a>
-    {% elif key in ["js", "exe", "css", "font", "html", "json", "image", "video", "unknown_mimetype", "text", "unset_mimetype", "octet-stream", "livestream"] and not urlnode.empty_response %}
+    {% elif key in ["js", "exe", "css", "font", "html", "json", "image", "video",
+                    "unknown_mimetype", "text", "unset_mimetype", "octet-stream", "livestream"]
+                    and not urlnode.empty_response %}
       <a href="{{ url_for('get_ressource', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}">
-        <img src="{{ path }}" alt="{{ key }}" width="21" height="21"
+        <img src="{{ url_for('static', filename=icon_info['icon']) }}" alt="{{ icon_info['tooltip'] }}"
+             width="21" height="21"
         {% if key == "image" %}
-        data-toggle="tooltip" data-placement="bottom" data-html="true" title='<img src="{{ url_for('get_ressource_preview', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"/> </br>Click to download the content of the response in a zip file'
+             data-toggle="tooltip" data-placement="bottom" data-html="true" title='<img src="{{ url_for('get_ressource_preview', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"/> </br>Click to download the content of the response in a zip file'
+        {% else %}
+                                                                                        data-toggle="tooltip" data-placement="bottom" data-html="true" title="{{icon_info['tooltip']}} <br/>Click to download."
         {% endif %}
         />
       </a>
     {% elif key != "redirect" %}
-    <img src="{{ path }}" alt="{{ key }}" width="21" height="21"/>
+    <img src="{{ url_for('static', filename=icon_info['icon']) }}"
+         alt="{{ icon_info['tooltip'] }}" title="{{ icon_info['tooltip'] }}" width="21" height="21"/>
     {%endif%}
   {%endif%}
 {% endfor %}
@@ -275,11 +285,13 @@
   <div title='{{ urlnode.redirect_url }}'>
     <b>Redirect to</b>: {{ shorten_string(urlnode.redirect_url, 50) }}
     <a href="#/" role="button" onclick="whereAmI('{{ child.hostnode_uuid }}')" title="See the node the URL redirects to.">
-      <img src="{{ lookup_dict['redirect'] }}" alt="{{ key }}" width="21" height="21"/>
+      <img src="{{ url_for('static', filename=lookup_dict['redirect']['icon']) }}" alt="{{ lookup_dict['redirect']['tooltip'] }}" width="21" height="21"/>
     </a>
   </div>
   {% else %}
-  <img src="{{ lookup_dict['redirect'] }}" alt="redirect" width="21" height="21"/>
+  <img src="{{ url_for('static', filename=lookup_dict['redirect']['icon']) }}"
+       alt="{{ lookup_dict['redirect']['tooltip'] }}" title="{{ lookup_dict['redirect']['tooltip'] }}"
+       width="21" height="21"/>
   {% endfor %}
 {%endif%}
 </div>