diff --git a/xep.xsl b/xep.xsl
index 874a797b..33d948da 100644
--- a/xep.xsl
+++ b/xep.xsl
@@ -135,6 +135,13 @@ OR OTHER DEALINGS IN THE SOFTWARE.
     <html>
       <head>
         <title>XEP-<xsl:value-of select='/xep/header/number'/>:<xsl:text> </xsl:text><xsl:value-of select='/xep/header/title' /></title>
+        <style type='text/css'>
+/* don't mind this hack */
+nav#toc h2:before {
+display: none;
+content: "XEP-<xsl:value-of select='/xep/header/number'/>";
+}
+        </style>
         <link rel='stylesheet' type='text/css' href='xmpp.v2.css' />
         <link href="prettify.css" type="text/css" rel="stylesheet" />
         <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
@@ -442,7 +449,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
   </xsl:template>
 
   <xsl:template name='processTOC'>
-    <h2>Table of Contents</h2>
+    <a href="#top"><h2>Table of Contents</h2></a>
     <ol class='toc'>
       <xsl:apply-templates select='//section1' mode='toc'/>
     </ol>
diff --git a/xmpp.v2.css b/xmpp.v2.css
index 58a21041..d510e4b5 100644
--- a/xmpp.v2.css
+++ b/xmpp.v2.css
@@ -1410,12 +1410,36 @@
         overflow-y: scroll;
     }
 
-    nav#toc > h2 {
+    nav#toc > a > h2 {
         font-size: 128.57143%;
         line-height: 1.16667;
         margin: 0 0 1.16667em 0;
     }
 
+    nav#toc > a {
+        font-size: inherit;
+        display: block;
+    }
+
+    nav#toc > a:hover,
+    nav#toc > a:focus {
+        background-color: transparent;
+    }
+
+    nav#toc h2:before {
+        display: block;
+        font-size: 150%;
+        background-color: rgba(19, 181, 234, 1.0);
+        margin: -0.333333em;
+        margin-bottom: 1em;
+        padding: 0.3333333em;
+        padding-left: 2.1666667em;
+        background-image: url('https://xmpp.org/theme/images/xmpp-logo.svg');
+        background-repeat: no-repeat;
+        background-size: 1.5em;
+        background-position: 0.33333333em 0.33333333em;
+    }
+
     nav#toc ol,
     nav#toc li {
         margin-left: 0;
