diff --git a/customize.dist/src/less2/include/markdown.less b/customize.dist/src/less2/include/markdown.less
index 364b3790c..11c8a7eb4 100644
--- a/customize.dist/src/less2/include/markdown.less
+++ b/customize.dist/src/less2/include/markdown.less
@@ -155,15 +155,23 @@
         text-align: left;
     }
 
-/*
-    span.cp-inline-img-warning {
-        //display: inline-block;
-        border: 1px solid red;
-        a, br, strong {
-            border: none;
-        }
-    } */
-    //.cp-inline-img { }
+    div.cp-inline-img-warning {
+        display: inline-block;
+        //border: 1px solid red !important; //  @cp_markdown-border !important;
+        padding: 10px;
+        //color: @cryptpad_color_light_red; // very bad in light mode
+        //background: @cryptpad_color_red_fader;
+
+        .cp-inline-img {
+            display: flex;
+            margin-bottom:10px;
+        }
+        .cp-alt-txt {
+            margin-left: 10px;
+            font-family: monospace;
+            font-size: 0.8em;
+        }
+    }
 }
 
 .markdown_cryptpad() {
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 4977cbbac..d432b0841 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -279,8 +279,6 @@ define([
         }
     };
 
-    var urlArgs = Util.find(ApiConfig, ['requireConf', 'urlArgs']) || '';
-
     renderer.image = function (href, title, text) { // XXX
         if (href.slice(0,6) === '/file/') { // XXX this has been deprecated for about 3 years... use the same inline image handler as below?
             // DEPRECATED
@@ -299,20 +297,22 @@ define([
             return mt;
         }
 
-        var warning = h('span.cp-inline-img-warning', [
-            h('img', {
-                src: '/images/broken.png?ver=' + ApiConfig.requireConf.urlArgs,
-            }),
-            h('br'),
-            h('span', {
-                //title: text,
+        var warning = h('div.cp-inline-img-warning', [
+            h('div.cp-inline-img', [
+                h('img.cp-inline-img', {
+                    src: '/images/broken.png',
+                    title: title || '',
+                }),
+                h('p.cp-alt-txt', text),
+            ]),
+            h('span.cp-img-block-notice', {
             }, "CryptPad blocked a remote image."),
             h('br'),
-            h('a', {
+            h('a.cp-remote-img', {
                 href: qualifiedHref(href),
             }, "Open its source in a new tab"),
             h('br'),
-            h('a', {
+            h('a.cp-learn-more', {
                 href: 'https://docs.cryptpad.fr/en/user_guide/index.html?placeholder=remote_images',
             }, 'learn why it was blocked'),
         ]);
@@ -827,26 +827,10 @@ define([
             });
 
             // replace remote images with links to those images
-            $content.find('span.cp-inline-img-warning').each(function (index, el) { // XXX
-/*
-    var link = h('a', {
-            href: href, //el.src, //common.getBounceURL(el.src), // XXX
-            //target: '_blank',
-            //rel: 'noopener noreferrer',
-            //title: title, //el.src,
-        }, [
-            'open image at ',
-            h('strong', href), //el.src),
-        ]);
-*/
-
-
-                console.log('INLINE_IMG', index, el);
+            $content.find('div.cp-inline-img-warning').each(function (index, el) {
                 if (!el) { return; }
-
-                var link = el.querySelector('a');
+                var link = el.querySelector('a.cp-remote-img');
                 if (!link) { return; }
-
                 link.onclick = function (ev) {
                     ev.preventDefault();
                     ev.stopPropagation();