diff --git a/doc/ns3_html_theme/layout.html b/doc/ns3_html_theme/layout.html
index 4e1e6061a..ca54c5215 100644
--- a/doc/ns3_html_theme/layout.html
+++ b/doc/ns3_html_theme/layout.html
@@ -31,88 +31,93 @@
 {% endblock %}
       
 {% block header %}
-  <div id="titlearea">
-    <table cellspacing="0" cellpadding="0" width="100%">
-      <tbody>
-	<tr style="height: 56px;">
-	  <td id="projectlogo">
-	    <a id="ns3_home1"
-	       href="http://www.nsnam.org/">
-	       <img alt="ns-3 Logo"
-		    src="{{ pathto('_static/' + theme_logo, 1)}}"/>
-	    </a>
-	  </td>
-	  <td id="projecttext">
-	    <div id="projectbrief">A Discrete-Event Network Simulator</div>
-	      <span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
-	  </td>
-	      
-	  <td id="ns3-menu">
-	    <div class="menu">
-	      <ul >
-	        <li><a id="ns3_home2"
-		       href="http://www.nsnam.org/"
-		       >&nbsp;&nbsp;Home</a>
-	        </li>
-	        <li><span
-		      onmouseover="mopen('mTuts')" 
-		      onmouseout="mclosetime()"
-			>Tutorials &nbsp;&#x25BC;</span>
-		    <div id="mTuts" 
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-		      <a id="ns3_tut"
-			 href="/docs/tutorial/html/index.html"
-			  >English</a><br/>
-	        </li>
-	        <li><span
-		      onmouseover="mopen('mDocs')" 
-		      onmouseout="mclosetime()"
-			>Docs &nbsp;&nbsp;&nbsp;&#x25BC;</span>
-		    <div id="mDocs"
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-		      <a id="ns3_man"
-			 href="/docs/manual/html/index.html"
-			 >Manual</a><br/>
-		      <a id="ns3_mod"
-			 href="/docs/models/html/index.html"
-			 >Models</a><br/>
-		      <a id="ns3_con"
-			 href="/docs/contributing/html/index.html"
-			 >Contributing</a><br/>
-		      <a id="ns3_wiki"
-			 href="http://www.nsnam.org/wiki"
-			 >Wiki</a><br/>
-	        </li>
-	        <li><span
-		      onmouseover="mopen('mDev')" 
-		      onmouseout="mclosetime()"
-			>Develop &#x25BC;</span>
-		    <div id="mDev"
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-		      <a id="ns3_api"
-			 href="/docs/doxygen/html/index.html"
-			 >API</a><br/>
-		      <a id="ns3_bugs"
-		       href="https://gitlab.com/nsnam/ns-3-dev/-/issues"
-			 >Issue Tracker</a><br/>
-		      <a id="ns3_merge"
-		       href="https://gitlab.com/nsnam/ns-3-dev/-/merge_requests"
-			 >Merge Requests</a><br/>
-	        </li>
-	      </ul>
-	    </div>
-	  </td>
-	  <td id="projectsection">
-	    <span style="margin-right:10px">{{ shorttitle }}</span>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-    <script  type="text/javascript">ns3_write_links()</script>
-  </div>
+    <div id="titlearea">
+      <table cellspacing="0" cellpadding="0" width="100%">
+        <tbody>
+          <tr style="height: 56px;">
+            <td id="projectlogo">
+              <a id="ns3_home1"
+                 href="http://www.nsnam.org/">
+                 <img alt="ns-3 Logo"
+                      src="{{ pathto('_static/' + theme_logo, 1)}}"/>
+              </a>
+            </td>
+            <td id="projecttext">
+              <div id="projectbrief">A Discrete-Event Network Simulator</div>
+              <span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
+            </td>
+
+            <td id="ns3-menu">
+              <div class="menu">
+                <ul >
+                  <li style="background-image:none">
+                    <a id="ns3_home2"
+                         href="http://www.nsnam.org/"
+                         >&nbsp;&nbsp;Home</a>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mTuts')" 
+                        onmouseout="mclosetime()"
+                          >Tutorials &nbsp;&#x25BC;</span>
+                      <div id="mTuts" 
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_tut"
+                           href="/docs/tutorial/html/index.html"
+                            >English</a><br/>
+                      </div>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mDocs')" 
+                        onmouseout="mclosetime()"
+                          >Documentation &nbsp;&#x25BC;</span>
+                      <div id="mDocs"
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_man"
+                           href="/docs/manual/html/index.html"
+                           >Manual</a><br/>
+                        <a id="ns3_mod"
+                           href="/docs/models/html/index.html"
+                           >Models</a><br/>
+                        <a id="ns3_con"
+                           href="/docs/contributing/html/index.html"
+                           >Contributing</a><br/>
+                        <a id="ns3_wiki"
+                           href="http://www.nsnam.org/wiki"
+                           >Wiki</a><br/>
+                      </div>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mDev')" 
+                        onmouseout="mclosetime()"
+                          >Development &nbsp;&#x25BC;</span>
+                      <div id="mDev"
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_api"
+                           href="/docs/doxygen/html/index.html"
+                           >API Docs</a><br/>
+                        <a id="ns3_bugs"
+                         href="https://gitlab.com/nsnam/ns-3-dev/-/issues"
+                           >Issue Tracker</a><br/>
+                        <a id="ns3_merge"
+                         href="https://gitlab.com/nsnam/ns-3-dev/-/merge_requests"
+                           >Merge Requests</a><br/>
+                      </div>
+                  </li>
+                </ul>
+              </div>
+            </td>
+
+            <td id="projectsection">
+              <span style="margin-right:10px">{{ shorttitle }}</span>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <script  type="text/javascript">ns3_write_links()</script>
+    </div>
 {% endblock %}
       
 {% block rootrellink %}
diff --git a/doc/ns3_html_theme/ns3_doxy_header.html b/doc/ns3_html_theme/ns3_doxy_header.html
index 27c20ffc9..17fd79c37 100644
--- a/doc/ns3_html_theme/ns3_doxy_header.html
+++ b/doc/ns3_html_theme/ns3_doxy_header.html
@@ -26,89 +26,93 @@ $extrastylesheet
 <body>
     <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-      <!--BEGIN TITLEAREA-->
-      <div id="titlearea">
-	<table cellspacing="0" cellpadding="0" width="100%">
-	  <tbody>
-	    <tr style="height: 56px;">
-	      <td id="projectlogo">
-		<a id="ns3_home1"
-		  href="http://www.nsnam.org/">
-		  <img alt="ns-3 Logo"
-		    src="$relpath$$projectlogo"/>
-		</a>
-	      </td>
-	      <td id="projecttext">
-		<div id="projectbrief">A Discrete-Event Network Simulator</div>
-		<span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
-		
-	      </td>
-	      <td id="ns3-menu">
-		<div class="menu">
-		  <ul >
-		    <li><a id="ns3_home2"
-			href="http://www.nsnam.org/"
-			>&nbsp;&nbsp;Home</a>
-		    </li>
-		    <li><span
-			onmouseover="mopen('mTuts')" 
-			onmouseout="mclosetime()"
-			>Tutorials &nbsp;&#x25BC;</span>
-		      <div id="mTuts" 
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-			<a id="ns3_tut"
-			  href="/docs/tutorial/html/index.html"
-			  >English</a><br/>
-		    </li>
-		    <li><span
-			onmouseover="mopen('mDocs')" 
-			onmouseout="mclosetime()"
-			>Docs &nbsp;&nbsp;&nbsp;&#x25BC;</span>
-		      <div id="mDocs"
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-			<a id="ns3_man"
-			    href="/docs/manual/html/index.html"
-			    >Manual</a><br/>
-			<a id="ns3_mod"
-			   href="/docs/models/html/index.html"
-			   >Models</a><br/>
-			<a id="ns3_con"
-			   href="/docs/contributing/html/index.html"
-			   >Contributing</a><br/>
-			<a id="ns3_wiki"
-			  href="http://www.nsnam.org/wiki"
-			  >Wiki</a><br/>
-		    </li>
-		    <li><span
-			onmouseover="mopen('mDev')" 
-			onmouseout="mclosetime()"
-			>Develop &#x25BC;</span>
-		      <div id="mDev"
-		        onmouseover="mcancelclosetime()" 
-		        onmouseout="mclosetime()">
-			<a id="ns3_api"
-			   href="/docs/doxygen/index.html"
-			   >API</a><br/>
-			<a id="ns3_bugs"
-			   href="https://gitlab.com/nsnam/ns-3-dev/-/issues"
-			   >Issue Tracker</a><br/>
-			<a id="ns3_merge"
-			   href="https://gitlab.com/nsnam/ns-3-dev/-/merge_requests"
-			   >Merge Requests</a><br/>
-		    </li>
-		  </ul>
-		</div>
-	      </td>
+    <!--BEGIN TITLEAREA-->
+    <div id="titlearea">
+      <table cellspacing="0" cellpadding="0" width="100%">
+        <tbody>
+          <tr style="height: 56px;">
+            <td id="projectlogo">
+              <a id="ns3_home1"
+		 href="http://www.nsnam.org/">
+		<img alt="ns-3 Logo"
+                     src="$relpath$$projectlogo"/>
+              </a>
+            </td>
+            <td id="projecttext">
+              <div id="projectbrief">A Discrete-Event Network Simulator</div>
+              <span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
+            </td>
 
-	      <td id="projectsection">
-		<span style="margin-right:10px">API</span>
-	      </td>
-	    </tr>
-	  </tbody>
-	</table>
-	<script  type="text/javascript">ns3_write_links();</script>
-      </div>
+            <td id="ns3-menu">
+              <div class="menu">
+                <ul >
+                  <li style="background-image:none">
+                    <a id="ns3_home2"
+                         href="http://www.nsnam.org/"
+                         >&nbsp;&nbsp;Home</a>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mTuts')" 
+                        onmouseout="mclosetime()"
+                          >Tutorials &nbsp;&#x25BC;</span>
+                      <div id="mTuts" 
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_tut"
+                           href="/docs/tutorial/html/index.html"
+                            >English</a><br/>
+                      </div>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mDocs')" 
+                        onmouseout="mclosetime()"
+                          >Documentation &nbsp;&#x25BC;</span>
+                      <div id="mDocs"
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_man"
+                           href="/docs/manual/html/index.html"
+                           >Manual</a><br/>
+                        <a id="ns3_mod"
+                           href="/docs/models/html/index.html"
+                           >Models</a><br/>
+                        <a id="ns3_con"
+                           href="/docs/contributing/html/index.html"
+                           >Contributing</a><br/>
+                        <a id="ns3_wiki"
+                           href="http://www.nsnam.org/wiki"
+                           >Wiki</a><br/>
+                      </div>
+                  </li>
+                  <li><span
+                        onmouseover="mopen('mDev')" 
+                        onmouseout="mclosetime()"
+                          >Development &nbsp;&#x25BC;</span>
+                      <div id="mDev"
+                          onmouseover="mcancelclosetime()" 
+                          onmouseout="mclosetime()">
+                        <a id="ns3_api"
+                           href="/docs/doxygen/html/index.html"
+                           >API Docs</a><br/>
+                        <a id="ns3_bugs"
+                         href="https://gitlab.com/nsnam/ns-3-dev/-/issues"
+                           >Issue Tracker</a><br/>
+                        <a id="ns3_merge"
+                         href="https://gitlab.com/nsnam/ns-3-dev/-/merge_requests"
+                           >Merge Requests</a><br/>
+                      </div>
+                  </li>
+                </ul>
+              </div>
+            </td>
+
+            <td id="projectsection">
+              <span style="margin-right:10px">API</span>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <script  type="text/javascript">ns3_write_links()</script>
+    </div>
 <!--END TITLEAREA-->
 <!-- end header part -->
diff --git a/doc/ns3_html_theme/static/ns3_links.js b/doc/ns3_html_theme/static/ns3_links.js
index 991b3318d..13b3a07a1 100644
--- a/doc/ns3_html_theme/static/ns3_links.js
+++ b/doc/ns3_html_theme/static/ns3_links.js
@@ -48,12 +48,12 @@ var ns3_con  = ns3_rel  + "contributing/"   + ns3_index;
 function ns3_write_links() {
   document.getElementById("ns3_home1").href = ns3_home;
   document.getElementById("ns3_home2").href = ns3_home;
-  document.getElementById("ns3_wiki" ).href = ns3_wiki;
-  document.getElementById("ns3_bugs" ).href = ns3_bugs;
-  document.getElementById("ns3_merge" ).href = ns3_merge;
-  
-  document.getElementById("ns3_api"  ).href = ns3_api;
+  document.getElementById("ns3_tut"  ).href = ns3_tut;
   document.getElementById("ns3_man"  ).href = ns3_man;
   document.getElementById("ns3_mod"  ).href = ns3_mod;
-  document.getElementById("ns3_tut"  ).href = ns3_tut;
+  document.getElementById("ns3_con"  ).href = ns3_con;
+  document.getElementById("ns3_wiki" ).href = ns3_wiki;
+  document.getElementById("ns3_api"  ).href = ns3_dox;
+  document.getElementById("ns3_bugs" ).href = ns3_bugs;
+  document.getElementById("ns3_merge").href = ns3_merge;
 }
diff --git a/doc/ns3_html_theme/static/ns3_stylesheet.css b/doc/ns3_html_theme/static/ns3_stylesheet.css
index 6fac9b63d..588054f68 100644
--- a/doc/ns3_html_theme/static/ns3_stylesheet.css
+++ b/doc/ns3_html_theme/static/ns3_stylesheet.css
@@ -140,14 +140,13 @@ div.sphinxsidebar a {
 /*   background-origin: padding-box; */
 /*   background-position: -10px 0; */
   background-repeat: no-repeat;
+  background-size: 100% 39px;
   display: table-cell;
   float:left;
   height: 40px;
   margin: 0px 0px 0px 0px;
-  overflow: hidden;
   padding:0px 0px 0px 0px;
   vertical-align: middle;
-  width: 450px;
 }