diff --git a/assets/layers/icons/icons.json b/assets/layers/icons/icons.json
index 36784b3a64..504e4aface 100644
--- a/assets/layers/icons/icons.json
+++ b/assets/layers/icons/icons.json
@@ -18,7 +18,13 @@
         "defaults",
         "in_favourite"
       ],
-      "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank' rel='noopener'><img src='./assets/svg/wikipedia.svg' textmode='📖' alt='Wikipedia'/></a>",
+      "render": {
+        "special": {
+          "type": "link",
+          "href": "https://wikipedia.org/wiki/{wikipedia}",
+          "text": "<img src='./assets/svg/wikipedia.svg' textmode='📖' alt='Wikipedia'/>"
+        }
+      },
       "condition": {
         "or": [
           "wikipedia~*",
@@ -29,7 +35,14 @@
         {
           "#": "ignore-image-in-then",
           "if": "wikipedia=",
-          "then": "<a class='h-8' href='https://www.wikidata.org/wiki/{wikidata}' target='_blank' rel='noopener'><img src='./assets/svg/wikidata.svg' alt='Wikidata'/></a>"
+          "then": {
+            "special": {
+              "type": "link",
+              "class": "h-8",
+              "href": "https://www.wikidata.org/wiki/{wikidata}",
+              "text": "<img src='./assets/svg/wikidata.svg' alt='Wikidata'/></a>"
+            }
+          }
         }
       ]
     },