diff --git a/static/skin/index.css b/static/skin/index.css
index ff90b571..191a071b 100644
--- a/static/skin/index.css
+++ b/static/skin/index.css
@@ -231,6 +231,7 @@
     position: relative;
     width: var(--tile-width);
     left: calc(0px - var(--tile-border-width));
+    text-decoration: none;
 }
 
 .book__download > img {
@@ -239,7 +240,6 @@
 }
 
 .book__download > span {
-    text-decoration: none;
     position: relative;
     font-family: roboto;
     color: white;
diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html
index cb747929..dd34a9b7 100644
--- a/static/templates/no_js_library_page.html
+++ b/static/templates/no_js_library_page.html
@@ -50,20 +50,11 @@
         pointer-events: none;
       }
 
-      .book__link__wrapper {
-        grid-column: 1 / 3;
-        grid-row: 1 / 3;
-      }
-
-      .book__link {
-        grid-row: 2 / 3;
-      }
-
       .kiwixHomeBody__results {
         flex-basis: 100%;
       }
 
-      #book__title>a, .book__download a {
+      #book__title>a {
         text-decoration: none;
         all: unset;
       }
@@ -117,25 +108,32 @@
         <h3 class="kiwixHomeBody__results">{{translations.count-of-matching-books}}</h3>
         {{#books}}
         <div class="book__wrapper">
-                <div class="book__link__wrapper">
-                    <div class="book__icon" {{faviconAttr}}></div>
-                    <div class="book__header">
-                        <div id="book__title"><a href="{{root}}/content/{{id}}">{{title}}</a></div>
-                        {{#downloadAvailable}}
-                        <div class="book__download"><span><a href="{{root}}/nojs/download/{{id}}">{{translations.download}}</a></span></div>
-                        {{/downloadAvailable}}
-                    </div>
-                    <a class="book__link" href="{{root}}/content/{{id}}" title="{{translations.preview-book}}" aria-label="{{translations.preview-book}}">
-                      <div class="book__description" title="{{description}}">{{description}}</div>
-                    </a>
-              </div>
-            <div class="book__languageTag" {{languageAttr}}>{{langCode}}</div>
-            <div class="book__tags"><div class="book__tags--wrapper">
-                {{#tagList}}
-                <span class="tag__link" aria-label='{{tag}}' title='{{tag}}'>{{tag}}</span>
-                {{/tagList}}
+            <a class="book__link" href="{{root}}/content/{{id}}" title="{{translations.preview-book}}" aria-label="{{translations.preview-book}}">
+            <div class="book__link__wrapper">
+            <div class="book__icon" {{faviconAttr}}></div>
+            <div class="book__header">
+                <div id="book__title">{{title}}</div>
             </div>
-        </div>
+            <div class="book__description" title="{{description}}">{{description}}</div>
+            </div>
+            </a>
+            <div class="book__meta">
+              <div class="book__languageTag" {{languageAttr}}>{{langCode}}</div>
+              <div class="book__tags"><div class="book__tags--wrapper">
+                  {{#tagList}}
+                  <span class="tag__link" aria-label='{{tag}}' title='{{tag}}'>{{tag}}</span>
+                  {{/tagList}}
+              </div>
+              </div>
+            </div>
+            {{#downloadAvailable}}
+            <div>
+              <a class="book__download" href="{{root}}/nojs/download/{{id}}">
+                <img src="{{root}}/skin/download-white.svg?KIWIXCACHEID">
+                <span>{{translations.download}}</span>
+              </a>
+            </div>
+            {{/downloadAvailable}}
         </div>
         {{/books}}
         </div>
diff --git a/test/library_server.cpp b/test/library_server.cpp
index 83d138de..2d52e5c1 100644
--- a/test/library_server.cpp
+++ b/test/library_server.cpp
@@ -1033,7 +1033,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "    />\n" \
   "    <link\n" \
   "      type=\"text/css\"\n" \
-  "      href=\"/ROOT%23%3F/skin/index.css?cacheid=a534f84d\"\n" \
+  "      href=\"/ROOT%23%3F/skin/index.css?cacheid=ae79e41a\"\n" \
   "      rel=\"Stylesheet\"\n" \
   "    />\n" \
   "    <link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3\">\n" \
@@ -1066,17 +1066,10 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "      .tag__link {\n" \
   "        pointer-events: none;\n" \
   "      }\n\n" \
-  "      .book__link__wrapper {\n" \
-  "        grid-column: 1 / 3;\n" \
-  "        grid-row: 1 / 3;\n" \
-  "      }\n\n" \
-  "      .book__link {\n" \
-  "        grid-row: 2 / 3;\n" \
-  "      }\n\n" \
   "      .kiwixHomeBody__results {\n" \
   "        flex-basis: 100%;\n" \
   "      }\n\n" \
-  "      #book__title>a, .book__download a {\n" \
+  "      #book__title>a {\n" \
   "        text-decoration: none;\n" \
   "        all: unset;\n" \
   "      }\n" \
@@ -1087,62 +1080,83 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
 
 #define CHARLES_RAY_BOOK_HTML \
   "        <div class=\"book__wrapper\">\n" \
-  "                <div class=\"book__link__wrapper\">\n" \
-  "                    <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/charlesray/?size=48)></div>\n" \
-  "                    <div class=\"book__header\">\n" \
-  "                        <div id=\"book__title\"><a href=\"/ROOT%23%3F/content/zimfile%26other\">Charles, Ray</a></div>\n" \
-  "                        <div class=\"book__download\"><span><a href=\"/ROOT%23%3F/nojs/download/zimfile%26other\">Download</a></span></div>\n" \
-  "                    </div>\n" \
-  "                    <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile%26other\" title=\"Preview\" aria-label=\"Preview\">\n" \
-  "                      <div class=\"book__description\" title=\"Wikipedia articles about Ray Charles\">Wikipedia articles about Ray Charles</div>\n" \
-  "                    </a>\n" \
-  "              </div>\n" \
-  "            <div class=\"book__languageTag\" >fra</div>\n" \
-  "            <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
-  "                <span class=\"tag__link\" aria-label='unittest' title='unittest'>unittest</span>\n" \
-  "                <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "            <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile%26other\" title=\"Preview\" aria-label=\"Preview\">\n" \
+  "            <div class=\"book__link__wrapper\">\n" \
+  "            <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/charlesray/?size=48)></div>\n" \
+  "            <div class=\"book__header\">\n" \
+  "                <div id=\"book__title\">Charles, Ray</div>\n" \
+  "            </div>\n" \
+  "            <div class=\"book__description\" title=\"Wikipedia articles about Ray Charles\">Wikipedia articles about Ray Charles</div>\n" \
+  "            </div>\n" \
+  "            </a>\n" \
+  "            <div class=\"book__meta\">\n" \
+  "              <div class=\"book__languageTag\" >fra</div>\n" \
+  "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
+  "                  <span class=\"tag__link\" aria-label='unittest' title='unittest'>unittest</span>\n" \
+  "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "              </div>\n" \
+  "              </div>\n" \
+  "            </div>\n" \
+  "            <div>\n" \
+  "              <a class=\"book__download\" href=\"/ROOT%23%3F/nojs/download/zimfile%26other\">\n" \
+  "                <img src=\"/ROOT%23%3F/skin/download-white.svg?cacheid=079ab989\">\n" \
+  "                <span>Download</span>\n" \
+  "              </a>\n" \
   "            </div>\n" \
-  "        </div>\n" \
   "        </div>\n"
 
 #define RAY_CHARLES_BOOK_HTML \
   "        <div class=\"book__wrapper\">\n" \
-  "                <div class=\"book__link__wrapper\">\n" \
-  "                    <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/raycharles/?size=48)></div>\n" \
-  "                    <div class=\"book__header\">\n" \
-  "                        <div id=\"book__title\"><a href=\"/ROOT%23%3F/content/zimfile_raycharles\">Ray Charles</a></div>\n" \
-  "                        <div class=\"book__download\"><span><a href=\"/ROOT%23%3F/nojs/download/zimfile_raycharles\">Download</a></span></div>\n" \
-  "                    </div>\n" \
-  "                    <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile_raycharles\" title=\"Preview\" aria-label=\"Preview\">\n" \
-  "                      <div class=\"book__description\" title=\"Wikipedia articles about Ray Charles\">Wikipedia articles about Ray Charles</div>\n" \
-  "                    </a>\n" \
-  "              </div>\n" \
-  "            <div class=\"book__languageTag\" >eng</div>\n" \
-  "            <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
-  "                <span class=\"tag__link\" aria-label='public_tag_without_a_value' title='public_tag_without_a_value'>public_tag_without_a_value</span>\n" \
-  "                <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "            <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile_raycharles\" title=\"Preview\" aria-label=\"Preview\">\n" \
+  "            <div class=\"book__link__wrapper\">\n" \
+  "            <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/raycharles/?size=48)></div>\n" \
+  "            <div class=\"book__header\">\n" \
+  "                <div id=\"book__title\">Ray Charles</div>\n" \
+  "            </div>\n" \
+  "            <div class=\"book__description\" title=\"Wikipedia articles about Ray Charles\">Wikipedia articles about Ray Charles</div>\n" \
+  "            </div>\n" \
+  "            </a>\n" \
+  "            <div class=\"book__meta\">\n" \
+  "              <div class=\"book__languageTag\" >eng</div>\n" \
+  "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
+  "                  <span class=\"tag__link\" aria-label='public_tag_without_a_value' title='public_tag_without_a_value'>public_tag_without_a_value</span>\n" \
+  "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "              </div>\n" \
+  "              </div>\n" \
+  "            </div>\n" \
+  "            <div>\n" \
+  "              <a class=\"book__download\" href=\"/ROOT%23%3F/nojs/download/zimfile_raycharles\">\n" \
+  "                <img src=\"/ROOT%23%3F/skin/download-white.svg?cacheid=079ab989\">\n" \
+  "                <span>Download</span>\n" \
+  "              </a>\n" \
   "            </div>\n" \
-  "        </div>\n" \
   "        </div>\n"
 
 #define RAY_CHARLES_UNCTZ_BOOK_HTML \
   "        <div class=\"book__wrapper\">\n" \
-  "                <div class=\"book__link__wrapper\">\n" \
-  "                    <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/raycharles_uncategorized/?size=48)></div>\n" \
-  "                    <div class=\"book__header\">\n" \
-  "                        <div id=\"book__title\"><a href=\"/ROOT%23%3F/content/zimfile_raycharles_uncategorized\">Ray (uncategorized) Charles</a></div>\n" \
-  "                        <div class=\"book__download\"><span><a href=\"/ROOT%23%3F/nojs/download/zimfile_raycharles_uncategorized\">Download</a></span></div>\n" \
-  "                    </div>\n" \
-  "                    <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile_raycharles_uncategorized\" title=\"Preview\" aria-label=\"Preview\">\n" \
-  "                      <div class=\"book__description\" title=\"No category is assigned to this library entry.\">No category is assigned to this library entry.</div>\n" \
-  "                    </a>\n" \
-  "              </div>\n" \
-  "            <div class=\"book__languageTag\" >rus,eng</div>\n" \
-  "            <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
-  "                <span class=\"tag__link\" aria-label='public_tag_with_a_value:value_of_a_public_tag' title='public_tag_with_a_value:value_of_a_public_tag'>public_tag_with_a_value:value_of_a_public_tag</span>\n" \
-  "                <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "            <a class=\"book__link\" href=\"/ROOT%23%3F/content/zimfile_raycharles_uncategorized\" title=\"Preview\" aria-label=\"Preview\">\n" \
+  "            <div class=\"book__link__wrapper\">\n" \
+  "            <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/raycharles_uncategorized/?size=48)></div>\n" \
+  "            <div class=\"book__header\">\n" \
+  "                <div id=\"book__title\">Ray (uncategorized) Charles</div>\n" \
+  "            </div>\n" \
+  "            <div class=\"book__description\" title=\"No category is assigned to this library entry.\">No category is assigned to this library entry.</div>\n" \
+  "            </div>\n" \
+  "            </a>\n" \
+  "            <div class=\"book__meta\">\n" \
+  "              <div class=\"book__languageTag\" >rus,eng</div>\n" \
+  "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
+  "                  <span class=\"tag__link\" aria-label='public_tag_with_a_value:value_of_a_public_tag' title='public_tag_with_a_value:value_of_a_public_tag'>public_tag_with_a_value:value_of_a_public_tag</span>\n" \
+  "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
+  "              </div>\n" \
+  "              </div>\n" \
+  "            </div>\n" \
+  "            <div>\n" \
+  "              <a class=\"book__download\" href=\"/ROOT%23%3F/nojs/download/zimfile_raycharles_uncategorized\">\n" \
+  "                <img src=\"/ROOT%23%3F/skin/download-white.svg?cacheid=079ab989\">\n" \
+  "                <span>Download</span>\n" \
+  "              </a>\n" \
   "            </div>\n" \
-  "        </div>\n" \
   "        </div>\n"
 
 #define FINAL_HTML_TEXT \
diff --git a/test/server.cpp b/test/server.cpp
index ed4f71e9..5c73d2c3 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -61,7 +61,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/i18n.js?cacheid=071abc9a" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=a534f84d" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=ae79e41a" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=8f4b6a1e" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
@@ -281,7 +281,7 @@ TEST_F(ServerTest, CacheIdsOfStaticResources)
     {
       /* url */ "/ROOT%23%3F/",
 R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/kiwix.css?cacheid=2158fad9"
-      href="/ROOT%23%3F/skin/index.css?cacheid=a534f84d"
+      href="/ROOT%23%3F/skin/index.css?cacheid=ae79e41a"
     <link rel="apple-touch-icon" sizes="180x180" href="/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3">
     <link rel="icon" type="image/png" sizes="32x32" href="/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625">
     <link rel="icon" type="image/png" sizes="16x16" href="/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc">