diff --git a/addons/web/models/ir_qweb.py b/addons/web/models/ir_qweb.py
index ec97efa6001..d1d792e8f54 100644
--- a/addons/web/models/ir_qweb.py
+++ b/addons/web/models/ir_qweb.py
@@ -3,6 +3,7 @@
 
 import hashlib
 from collections import OrderedDict
+from werkzeug.urls import url_quote
 
 from odoo import api, models
 from odoo.tools import pycompat
@@ -45,17 +46,26 @@ class Image(models.AbstractModel):
         sha = hashlib.sha1(str(getattr(record, '__last_update')).encode('utf-8')).hexdigest()[0:7]
         max_size = '' if max_size is None else '/%s' % max_size
         avoid_if_small = '&avoid_if_small=true' if options.get('avoid_if_small') else ''
-        src = '/web/image/%s/%s/%s%s?unique=%s%s' % (record._name, record.id, options.get('preview_image', field_name), max_size, sha, avoid_if_small)
 
-        alt = None
+        if options.get('filename-field') and getattr(record, options['filename-field'], None):
+            filename = record[options['filename-field']]
+        elif options.get('filename'):
+            filename = options['filename']
+        else:
+            filename = record.display_name
+
+        src = '/web/image/%s/%s/%s%s/%s?unique=%s%s' % (record._name, record.id, options.get('preview_image', field_name), max_size, url_quote(filename), sha, avoid_if_small)
+
         if options.get('alt-field') and getattr(record, options['alt-field'], None):
             alt = escape(record[options['alt-field']])
         elif options.get('alt'):
             alt = options['alt']
+        else:
+            alt = escape(record.display_name)
 
         src_zoom = None
         if options.get('zoom') and getattr(record, options['zoom'], None):
-            src_zoom = '/web/image/%s/%s/%s%s?unique=%s' % (record._name, record.id, options['zoom'], max_size, sha)
+            src_zoom = '/web/image/%s/%s/%s%s/%s?unique=%s' % (record._name, record.id, options['zoom'], max_size, url_quote(filename), sha)
         elif options.get('zoom'):
             src_zoom = options['zoom']
 
diff --git a/addons/website/tests/test_qweb.py b/addons/website/tests/test_qweb.py
index 5e078d89dd6..67e22117cde 100644
--- a/addons/website/tests/test_qweb.py
+++ b/addons/website/tests/test_qweb.py
@@ -56,10 +56,12 @@ class TestQweb(TransactionCase):
         <div widget="html"><span class="toto">
                 span<span class="fa"></span><img src="http://test.cdn/web/image/1">
             </span></div>
-        <div widget="image"><img src="http://test.cdn/web/image/res.users/%(user_id)s/image" class="img img-fluid"/></div>
+        <div widget="image"><img src="http://test.cdn/web/image/res.users/%(user_id)s/image/%(filename)s" class="img img-fluid" alt="%(alt)s"/></div>
     </body>
 </html>""" % {
             "js": attachments[0].url,
             "css": attachments[1].url,
             "user_id": demo.id,
+            "filename": "Marc%20Demo",
+            "alt": "Marc Demo",
         }).encode('utf8'))