diff --git a/scripts/kiwix-resources b/scripts/kiwix-resources
index af30fa577..08295c384 100755
--- a/scripts/kiwix-resources
+++ b/scripts/kiwix-resources
@@ -43,15 +43,12 @@ def fill_resource_revisions(resource_file_path):
     for resource in read_resource_file(resource_file_path):
         resource_revisions[resource] = get_resource_revision(base_dir, resource)
 
-RESOURCE_WITH_CACHEID_URL_PATTERN=r'([^"?]+)\?KIWIXCACHEID([^"]*)'
+RESOURCE_WITH_CACHEID_URL_PATTERN=r'((.*)/skin/([^"?]+))\?KIWIXCACHEID([^"]*)'
 
 def set_cacheid(resource_matchobj):
     path = resource_matchobj.group(1)
-    resource = path
-    root_prefix = '{{root}}/'
-    if resource.startswith(root_prefix):
-        resource = resource[len(root_prefix):]
-    extra_query = resource_matchobj.group(2)
+    resource = 'skin/' + resource_matchobj.group(3)
+    extra_query = resource_matchobj.group(4)
     cacheid = 'cacheid=' + resource_revisions[resource]
     return f'{path}?{cacheid}{extra_query}'
 
diff --git a/static/skin/index.js b/static/skin/index.js
index 267da4098..5c435ac6b 100644
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -171,25 +171,25 @@
                     <div class="modal-content">
                         <div class="modal-regular-download">
                             <a href="${downloadLink}" download>
-                                <img src="../skin/download.png" alt="direct download" />
+                                <img src="../skin/download.png?KIWIXCACHEID" alt="direct download" />
                                 <div>Direct</div>
                             </a>
                         </div>
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.sha256" download>
-                                <img src="../skin/hash.png" alt="download hash" />
+                                <img src="../skin/hash.png?KIWIXCACHEID" alt="download hash" />
                                 <div>Sha256 hash</div>
                             </a>
                         </div>
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.magnet" target="_blank">
-                                <img src="../skin/magnet.png" alt="download magnet" />
+                                <img src="../skin/magnet.png?KIWIXCACHEID" alt="download magnet" />
                                 <div>Magnet link</div>
                             </a>
                         </div>
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.torrent" download>
-                                <img src="../skin/bittorrent.png" alt="download torrent" />
+                                <img src="../skin/bittorrent.png?KIWIXCACHEID" alt="download torrent" />
                                 <div>Torrent file</div>
                             </a>
                         </div>
diff --git a/test/server.cpp b/test/server.cpp
index 7a6ddf307..22fb87897 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -319,15 +319,15 @@ R"EXPECTEDRESULT(      src="/ROOT/skin/jquery-ui/external/jquery/jquery.js?cache
           src: url("/ROOT/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
     <script src="/ROOT/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=ea9ce83c" defer></script>
+    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=f2c89cb2" defer></script>
 )EXPECTEDRESULT"
     },
     {
       /* url */ "/ROOT/skin/index.js",
-R"EXPECTEDRESULT(                                <img src="../skin/download.png" alt="direct download" />
-                                <img src="../skin/hash.png" alt="download hash" />
-                                <img src="../skin/magnet.png" alt="download magnet" />
-                                <img src="../skin/bittorrent.png" alt="download torrent" />
+R"EXPECTEDRESULT(                                <img src="../skin/download.png?cacheid=a39aa502" alt="direct download" />
+                                <img src="../skin/hash.png?cacheid=f836e872" alt="download hash" />
+                                <img src="../skin/magnet.png?cacheid=73b6bddf" alt="download magnet" />
+                                <img src="../skin/bittorrent.png?cacheid=4f5c6882" alt="download torrent" />
 )EXPECTEDRESULT"
     },
     {