diff --git a/static/viewer.html b/static/viewer.html
index 848d6cb67..e7ece5ea7 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -11,11 +11,10 @@
   </head>
 
   <body style="margin:0" onload="handle_visual_viewport_change()">
-    <div id=taskbar style="background:#bbffbb">Taskbar</div>
-    <!--
     <span class="kiwix">
       <span id="kiwixtoolbar" class="ui-widget-header">
         <div class="kiwix_centered">
+          <!--
           <div class="kiwix_searchform">
             <form class="kiwixsearch" method="GET" action="{{root}}/search" id="kiwixsearchform">
               {{#hascontent}}<input type="hidden" name="content" value="{{content}}" />{{/hascontent}}
@@ -23,22 +22,22 @@
               <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text" title="Search '{{title}}'" aria-label="Search '{{title}}'">
             </form>
           </div>
+          -->
             <input type="checkbox" id="kiwix_button_show_toggle">
-            <label for="kiwix_button_show_toggle"><img src="{{root}}/skin/caret.png" alt=""></label>
+            <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?KIWIXCACHEID" alt=""></label>
             <div class="kiwix_button_cont">
-              {{#withlibrarybutton}}
-                <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="{{root}}/"><button>&#x1f3e0;</button></a>
-              {{/withlibrarybutton}}
+                <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="#"><button>&#x1f3e0;</button></a>
+              <!--
               {{#hascontent}}
               <a id="kiwix_serve_taskbar_home_button" title="Go to the main page of '{{title}}'" aria-label="Go to the main page of '{{title}}'" href="{{root}}/{{content}}/"><button>{{title}}</button></a>
               <a id="kiwix_serve_taskbar_random_button" title="Go to a randomly selected page" aria-label="Go to a randomly selected page"
                 href="{{root}}/random?content={{#urlencoded}}{{{content}}}{{/urlencoded}}"><button>&#x1F3B2;</button></a>
               {{/hascontent}}
+              -->
             </div>
         </div>
       </span>
     </span>
-    -->
 
     <iframe id="content_iframe"
             referrerpolicy="same-origin"
diff --git a/test/server.cpp b/test/server.cpp
index 71aa88c55..cc49ad89e 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -202,8 +202,9 @@ R"EXPECTEDRESULT(                                <img src="../skin/download.png?
       /* url */ "/ROOT/viewer",
 R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=26082885" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-    <script type="text/javascript" src="./skin/viewer_taskbar.js?cacheid=1aec4a68" defer></script>
+    <script type="text/javascript" src="./skin/viewer_taskbar.js?cacheid=5d6c2a30" defer></script>
     <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
+            <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>
           return '/skin/blank.html';
         if ( url == '/skin/blank.html' ) {
 )EXPECTEDRESULT"
