diff --git a/javascripts/discourse/connectors/below-docs-topic/d-toc-wrapper.hbs b/javascripts/discourse/connectors/below-docs-topic/d-toc-wrapper.hbs
index 942e818..5149390 100644
--- a/javascripts/discourse/connectors/below-docs-topic/d-toc-wrapper.hbs
+++ b/javascripts/discourse/connectors/below-docs-topic/d-toc-wrapper.hbs
@@ -1 +1,14 @@
-{{! Docs TOC placeholder }}
+<div class="d-toc-main">
+  <div class="d-toc-icons">
+    <a
+      href="#"
+      class="scroll-to-bottom"
+      title={{i18n (theme-prefix "post_bottom_tooltip")}}
+    >
+      {{d-icon "downward"}}
+    </a>
+    <a href="#" class="d-toc-close">{{d-icon "times"}}</a>
+  </div>
+  <div id="d-toc">
+  </div>
+</div>
diff --git a/javascripts/discourse/connectors/topic-navigation/d-toc-wrapper.hbs b/javascripts/discourse/connectors/topic-navigation/d-toc-wrapper.hbs
index 4c33e07..5149390 100644
--- a/javascripts/discourse/connectors/topic-navigation/d-toc-wrapper.hbs
+++ b/javascripts/discourse/connectors/topic-navigation/d-toc-wrapper.hbs
@@ -1 +1,14 @@
-{{! TOC placeholder }}
+<div class="d-toc-main">
+  <div class="d-toc-icons">
+    <a
+      href="#"
+      class="scroll-to-bottom"
+      title={{i18n (theme-prefix "post_bottom_tooltip")}}
+    >
+      {{d-icon "downward"}}
+    </a>
+    <a href="#" class="d-toc-close">{{d-icon "times"}}</a>
+  </div>
+  <div id="d-toc">
+  </div>
+</div>
diff --git a/javascripts/discourse/initializers/disco-toc-main.js b/javascripts/discourse/initializers/disco-toc-main.js
index e843caf..7ec2681 100644
--- a/javascripts/discourse/initializers/disco-toc-main.js
+++ b/javascripts/discourse/initializers/disco-toc-main.js
@@ -1,10 +1,8 @@
 import domUtils from "discourse-common/utils/dom-utils";
 import { headerOffset } from "discourse/lib/offset-calculator";
-import { iconHTML } from "discourse-common/lib/icon-library";
 import { later } from "@ember/runloop";
 import { slugify } from "discourse/lib/utilities";
 import { withPluginApi } from "discourse/lib/plugin-api";
-import I18n from "I18n";
 
 export default {
   name: "disco-toc-main",
@@ -150,16 +148,7 @@ export default {
   },
 
   insertTOC(headings) {
-    const dToc = document.createElement("div");
-    dToc.classList.add("d-toc-main");
-    dToc.innerHTML = `
-      <div class="d-toc-icons">
-        <a href="#" class="scroll-to-bottom" title="${I18n.t(
-          themePrefix("post_bottom_tooltip")
-        )}">${iconHTML("downward")}</a>
-        <a href="#" class="d-toc-close">${iconHTML("times")}</a>
-      </div>
-    `;
+    const dToc = document.querySelector(".d-toc-main");
 
     const existing = document.querySelector(".d-toc-wrapper .d-toc-main");
     if (existing) {
@@ -168,8 +157,7 @@ export default {
       document.querySelector(".d-toc-wrapper").appendChild(dToc);
     }
 
-    const result = this.buildTOC(Array.from(headings));
-    document.querySelector(".d-toc-main").appendChild(result);
+    this.buildTOC(Array.from(headings));
     document.addEventListener("click", this.clickTOC, false);
   },
 
@@ -239,9 +227,7 @@ export default {
   },
 
   buildTOC(headings) {
-    const result = document.createElement("div");
-    result.setAttribute("id", "d-toc");
-
+    const toc = document.querySelector("#d-toc");
     const primaryH = headings[0].tagName;
     const primaryHeadings = headings.filter((n) => n.tagName === primaryH);
     let nextIndex = headings.length;
@@ -274,10 +260,10 @@ export default {
         }
       });
 
-      result.appendChild(ul);
+      toc.appendChild(ul);
     });
 
-    return result;
+    return toc;
   },
 
   buildItem(node) {