diff --git a/static/resources_list.txt b/static/resources_list.txt
index 71ebe6760..e339a31a4 100644
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -10,6 +10,7 @@ skin/iso6391To3.js
 skin/isotope.pkgd.min.js
 skin/index.js
 skin/autoComplete.min.js
+skin/kiwix.css
 skin/taskbar.css
 skin/index.css
 skin/fonts/Poppins.ttf
diff --git a/static/skin/index.css b/static/skin/index.css
index c7dbb78c9..407fb7746 100644
--- a/static/skin/index.css
+++ b/static/skin/index.css
@@ -517,13 +517,3 @@ body {
         grid-template-columns: 1fr;
     }
 }
-
-@font-face {
-  font-family: "poppins";
-  src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
-}
-
-@font-face {
-  font-family: "roboto";
-  src: url("../skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
-}
diff --git a/static/skin/kiwix.css b/static/skin/kiwix.css
new file mode 100644
index 000000000..da460c076
--- /dev/null
+++ b/static/skin/kiwix.css
@@ -0,0 +1,9 @@
+@font-face {
+  font-family: "poppins";
+  src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
+}
+
+@font-face {
+  font-family: "roboto";
+  src: url("../skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
+}
diff --git a/static/skin/taskbar.css b/static/skin/taskbar.css
index 865c8c6f9..022387dea 100644
--- a/static/skin/taskbar.css
+++ b/static/skin/taskbar.css
@@ -256,13 +256,3 @@ a.suggest, a.suggest:visited, a.suggest:hover, a.suggest:active {
         width: 80%;
     }
 }
-
-@font-face {
-  font-family: "poppins";
-  src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
-}
-
-@font-face {
-    font-family: "roboto";
-    src: url("../skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
-}
diff --git a/static/templates/index.html b/static/templates/index.html
index 570d78ac5..46be2d7f9 100644
--- a/static/templates/index.html
+++ b/static/templates/index.html
@@ -5,6 +5,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <link type="root" href="{{root}}">
     <title>Welcome to Kiwix Server</title>
+    <link
+      type="text/css"
+      href="{{root}}/skin/kiwix.css?KIWIXCACHEID"
+      rel="Stylesheet"
+    />
     <link
       type="text/css"
       href="{{root}}/skin/index.css?KIWIXCACHEID"
diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html
index edab66fc6..71c7ab6d6 100644
--- a/static/templates/no_js_library_page.html
+++ b/static/templates/no_js_library_page.html
@@ -5,6 +5,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <link type="root" href="{{root}}">
     <title>{{translations.welcome-to-kiwix-server}}</title>
+    <link
+      type="text/css"
+      href="{{root}}/skin/kiwix.css?KIWIXCACHEID"
+      rel="Stylesheet"
+    />
     <link
       type="text/css"
       href="{{root}}/skin/index.css?KIWIXCACHEID"
@@ -137,4 +142,4 @@
     </div>
     <div id="kiwixfooter" class="kiwixfooter">{{{translations.powered-by-kiwix-html}}}</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/static/viewer.html b/static/viewer.html
index 392e26243..49899723a 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -8,6 +8,7 @@
                    object-src 'none';">
     <title>ZIM Viewer</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link type="text/css" href="./skin/kiwix.css?KIWIXCACHEID" rel="Stylesheet" />
     <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?KIWIXCACHEID" rel="Stylesheet" />
     <script type="text/javascript" src="./viewer_settings.js"></script>
diff --git a/test/library_server.cpp b/test/library_server.cpp
index 4b0019952..8c16fe67d 100644
--- a/test/library_server.cpp
+++ b/test/library_server.cpp
@@ -1028,7 +1028,12 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "    <title>Welcome to Kiwix Server</title>\n" \
   "    <link\n" \
   "      type=\"text/css\"\n" \
-  "      href=\"/ROOT%23%3F/skin/index.css?cacheid=2446b723\"\n" \
+  "      href=\"/ROOT%23%3F/skin/kiwix.css?cacheid=27f092fb\"\n" \
+  "      rel=\"Stylesheet\"\n" \
+  "    />\n" \
+  "    <link\n" \
+  "      type=\"text/css\"\n" \
+  "      href=\"/ROOT%23%3F/skin/index.css?cacheid=e4d76d16\"\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" \
@@ -1145,7 +1150,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "    </div>\n" \
   "    <div id=\"kiwixfooter\" class=\"kiwixfooter\">Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a></div>\n" \
   "    </body>\n" \
-  "</html>"
+  "</html>\n"
 
 #define FILTERS_HTML(SELECTED_ENG) \
   "      <div class=\"kiwixNav__filters\">\n" \
diff --git a/test/server.cpp b/test/server.cpp
index 44c62801e..efb6e3924 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=6a8c6fb2" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=2446b723" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=e4d76d16" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=ce19da2a" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
@@ -71,7 +71,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/mustache.min.js?cacheid=bd23c4fb" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=5ab04b5a" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=74156c3a" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=201653b8" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
@@ -140,6 +140,8 @@ const ResourceCollection resources200Uncompressible{
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/favicon/site.webmanifest?cacheid=bc396efb" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/hash.png" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/hash.png?cacheid=f836e872" },
+  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/kiwix.css" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/kiwix.css?cacheid=27f092fb" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/magnet.png" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/magnet.png?cacheid=73b6bddf" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/search-icon.svg" },
@@ -274,7 +276,8 @@ TEST_F(ServerTest, CacheIdsOfStaticResources)
   const std::vector<UrlAndExpectedResult> testData{
     {
       /* url */ "/ROOT%23%3F/",
-R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=2446b723"
+R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/kiwix.css?cacheid=27f092fb"
+      href="/ROOT%23%3F/skin/index.css?cacheid=e4d76d16"
     <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">
@@ -289,13 +292,17 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=2446b723"
     <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=ce19da2a" defer></script>
         <img src="/ROOT%23%3F/skin/feed.svg?cacheid=055b333f"
         <img src="/ROOT%23%3F/skin/langSelector.svg?cacheid=00b59961"
+)EXPECTEDRESULT"
+    },
+    {
+      /* url */ "/ROOT%23%3F/skin/kiwix.css",
+R"EXPECTEDRESULT(  src: url("../skin/fonts/Poppins.ttf?cacheid=af705837") format("truetype");
+  src: url("../skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
 )EXPECTEDRESULT"
     },
     {
       /* url */ "/ROOT%23%3F/skin/index.css",
 R"EXPECTEDRESULT(    background-image: url('../skin/search-icon.svg?cacheid=b10ae7ed');
-  src: url("../skin/fonts/Poppins.ttf?cacheid=af705837") format("truetype");
-  src: url("../skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
 )EXPECTEDRESULT"
     },
     {
@@ -308,7 +315,8 @@ R"EXPECTEDRESULT(                                <img src="${root}/skin/download
     },
     {
       /* url */ "/ROOT%23%3F/viewer",
-R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=5ab04b5a" rel="Stylesheet" />
+R"EXPECTEDRESULT(    <link type="text/css" href="./skin/kiwix.css?cacheid=27f092fb" rel="Stylesheet" />
+    <link type="text/css" href="./skin/taskbar.css?cacheid=74156c3a" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
     <script type="module" src="./skin/i18n.js?cacheid=6a8c6fb2" defer></script>
     <script type="text/javascript" src="./skin/languages.js?cacheid=96f2cf73" defer></script>