diff --git a/docs/html-ndk/ndk/downloads/downloads_toc.cs b/docs/html-ndk/ndk/downloads/downloads_toc.cs
index 66d000764b563..fca91bc1e30ca 100644
--- a/docs/html-ndk/ndk/downloads/downloads_toc.cs
+++ b/docs/html-ndk/ndk/downloads/downloads_toc.cs
@@ -8,7 +8,10 @@
 
 
 <ul id="nav">
-  <li><a href="/ndk/downloads/index.html"><span class="en">NDK Download</span></a></li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="/ndk/downloads/index.html"><span class="en">
+      NDK Download</span></a>
+  </li>
 </ul>
 
 
diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html-ndk/ndk/guides/guides_toc.cs
index 90eaea4f82c24..854169dcf76b8 100644
--- a/docs/html-ndk/ndk/guides/guides_toc.cs
+++ b/docs/html-ndk/ndk/guides/guides_toc.cs
@@ -7,65 +7,67 @@
 ?>
 
 <ul id="nav">
-<li><strong>NDK</strong>
-   <ul>
-   <li><a href="/ndk/guides/index.html"><span class="en">Getting Started</span></a>
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/index.html"><span class="en">
+      Getting Started</span></a></div>
       <ul>
-      <li><a href="setup.html">Setup</a></li>
-      <li><a href="concepts.html">Concepts</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/build.html"><span class="en">Building</span></a>
+         <li><a href="setup.html">Setup</a></li>
+         <li><a href="concepts.html">Concepts</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/build.html"><span class="en">
+      Building</span></a></div>
       <ul>
-      <li><a href="">ndk-build</a></li>
-      <li><a href="">Android.mk</a></li>
-      <li><a href="">Application.mk</a></li>
-      <li><a href="">Standalone Toolchain</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/debug.html"><span class="en">Debugging</span></a>
+         <li><a href="#">ndk-build</a></li>
+         <li><a href="#">Android.mk</a></li>
+         <li><a href="#">Application.mk</a></li>
+         <li><a href="#">Standalone Toolchain</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/debug.html"><span class="en">
+      Debugging</span></a></div>
       <ul>
-      <li><a href="">ndk-gdb</a></li>
-      <li><a href="">ndk-stack</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/arch.html"><span class="en">Architectures and CPUs</span></a>
+         <li><a href="#">ndk-gdb</a></li>
+         <li><a href="#">ndk-stack</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/arch.html"><span class="en">
+      Architectures and CPUs</span></a></div>
       <ul>
-      <li><a href="">ABI Management</a></li>
-      <li><a href="">Neon</a></li>
-      <li><a href="">Mips</a></li>
-      <li><a href="">x86</a></li>
-      <li><a href="">x86-64</a></li>
-      <li><a href="">CPU Features</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/libs.html"><span class="en">Libraries</span></a>
+         <li><a href="#">ABI Management</a></li>
+         <li><a href="#">Neon</a></li>
+         <li><a href="#">Mips</a></li>
+         <li><a href="#">x86</a></li>
+         <li><a href="#">x86-64</a></li>
+         <li><a href="#">CPU Features</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/libs.html"><span class="en">
+      Libraries</span></a></div>
       <ul>
-      <li><a href="">Stable APIs</a></li>
-      <li><a href="">C++ Support</a></li>
-      <li><a href="">Prebuilt Libraries</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/sample.html"><span class="en">Sample Walkthrough</span></a>
+      <li><a href="#">Stable APIs</a></li>
+      <li><a href="#">C++ Support</a></li>
+      <li><a href="#">Prebuilt Libraries</a></li>
+      </ul>
+   </li>
+
+   <li class="nav-section">
+      <div class="nav-section-header"><a href="/ndk/guides/sample.html"><span class="en">
+      Sample Walkthrough</span></a></div>
       <ul>
-      <li><a href="">hello-jni</a></li>
-      <li><a href="">native-activity</a></li>
-      <li><a href="">Teapot</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/atomics.html"><span class="en">Atomics</span></a></li>
-   <li><a href="/ndk/guides/importing.html"><span class="en">Importing Modules</span></a></li>
-   <li><a href="/ndk/guides/depends.html"><span class="en">ndk-depends</span></a></li>
-   <li><a href="/ndk/guides/system.html"><span class="en">System Image Issues</span></a></li>
-   <li><a href="/ndk/guides/licenses.html"><span class="en">Licenses</span></a></li>
-   </ul></li>
-<li><strong>Radiance</strong>
-   <ul>
-   <li><a href="/ndk/guides/null.html"><span class="en">Stub 1</span></a>
-      <ul>
-      <li><a href="">Stublet</a></li>
-      <li><a href="">Stublet</a></li>
-      </ul></li>
-   <li><a href="/ndk/guides/null.html"><span class="en">Stub 2, etc.</span></a>
-      <ul>
-      <li><a href="">Another Stublet</a></li>
-      <li><a href="">Another Stublet</a></li>
-      </ul></li>
-   </ul></li>
+      <li><a href="#">hello-jni</a></li>
+      <li><a href="#">native-activity</a></li>
+      <li><a href="#">Teapot</a></li>
+      </ul>
+   </li>
 
 </ul>
 
diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html-ndk/ndk/reference/reference_toc.cs
index 01364a69e1b6b..3e1056261128b 100644
--- a/docs/html-ndk/ndk/reference/reference_toc.cs
+++ b/docs/html-ndk/ndk/reference/reference_toc.cs
@@ -6,16 +6,47 @@
        localized titles are added in the language order specified below.
 ?>
 
-
 <ul id="nav">
-  <li><a href="/ndk/reference/index.html"><span class="en">foo.h</span></a></li>
+  <li class="nav-section">
+    <div class="nav-section-header"><a href="group___asset.html"><span class="en">Asset</span></a></div>
+    <ul>
+      <li><a href="asset__manager_8h.html">asset_manager.h</a></li>
+      <li><a href="asset__manager__jni_8h.html">asset_manager_jni.h</a></li>
+    </ul>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___bitmap.html"><span class="en">
+    Bitmap</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___configuration.html"><span class="en">
+    Configuration</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___input.html"><span class="en">
+    Input</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___looper.html"><span class="en">
+    Looper</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___native_activity.html"><span class="en">
+    Native Activity</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___sensor.html"><span class="en">
+    Sensor</span></a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="group___storage.html"><span class="en">
+    Storage</span></a></div>
+  </li>
 </ul>
 
-
 <script type="text/javascript">
 <!--
     buildToggleLists();
     changeNavLang(getLangPref());
 //-->
-</script>
-
+</script>
\ No newline at end of file
diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html-ndk/ndk/samples/samples_toc.cs
index 9fb036e3d7f3d..9a39f04c2f673 100644
--- a/docs/html-ndk/ndk/samples/samples_toc.cs
+++ b/docs/html-ndk/ndk/samples/samples_toc.cs
@@ -8,7 +8,11 @@
 
 
 <ul id="nav">
-  <li><a href="/ndk/samples/index.html"><span class="en">Stuff</span></a></li>
+
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="/ndk/samples/index.html"><span class="en">
+      Samples</span></a></div>
+  </li>
 </ul>