diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
index 57fe3b95..687b6ffd 100755
--- a/lib/gollum/frontend/public/gollum/css/gollum.css
+++ b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -90,35 +90,17 @@ a:hover, a:visited {
   background-color: #F7F7F7;
   border: 1px solid #DDD;
   font-size: 13px;
-  padding: 7px;
+  padding: 0px 5px;
   float:left;
   margin-bottom: 20px;
+  min-width: 33%;
   
   border-radius: 0.5em;
   -moz-border-radius: 0.5em;
   -webkit-border-radius: 0.5em;
 }
-
-#wiki-toc-main > h2 {
-  font-size: 24px;
-  border-bottom: 1px solid #CCC;
-  color: black;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-
-#wiki-toc-main ul {
-  -webkit-margin-before: 0px;
-  -webkit-padding-start: 0px;
-  margin-left: 1em;
-  margin-right: 1em;
-  padding-left: 0;
-}
-
-#wiki-toc-main ul li {
-  line-height: 1.75em;
-  list-style-position: inside;
-  list-style-type: round;
+#wiki-toc-main > div {
+  border: none;
 }
 
 /* @section rightbar */
diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css
index 93c71205..01ca88e2 100644
--- a/lib/gollum/frontend/public/gollum/css/template.css
+++ b/lib/gollum/frontend/public/gollum/css/template.css
@@ -367,35 +367,43 @@ a.absent {
   margin: 0;
   padding: 0;
 }
-.markdown-body .toc {
+.toc {
+  background-color: #F7F7F7;
   border: 1px solid #ddd;
   padding: 5px 10px;
   margin: 0;
   border-radius: 3px;
 }
-.markdown-body .toc-title {
+.toc-title {
   color: #888;
+  font-size: 14px;
+  line-height: 1.6;
   padding: 2px;
   border-bottom: 1px solid #ddd;
   margin-bottom: 3px;
 }
-.markdown-body .toc ul {
+.toc ul {
   padding-left: 10px;
   margin: 0;
 }
-.markdown-body .toc>ul {
+.toc>ul {
   margin-left: 10px;
   font-size: 17px;
 }
-.markdown-body .toc ul ul {
+.toc ul ul {
   font-size: 15px;
 }
-.markdown-body .toc ul ul ul {
+.toc ul ul ul {
   font-size: 14px;
 }
-.markdown-body .toc ul li{
+.toc ul li{
   margin: 0;
 }
+#header-content .toc,
+#footer-content .toc,
+#sidebar-content .toc {
+  border: none;
+}
 .highlight {
   background: #fff;
 }
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index cac436e5..eb59fe2a 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -20,8 +20,7 @@
 <div id="wiki-content">
 <div class="{{#has_header}}has-header{{/has_header}}{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}} has-rightbar{{/has_sidebar}}{{#has_toc}} has-toc{{/has_toc}}">
   {{#has_toc}}
-  <div id="wiki-toc-main" class="gollum-{{sidebar_format}}-content">
-    <h2>Table of contents</h2>
+  <div id="wiki-toc-main">
     {{{toc_content}}}
   </div>
   {{/has_toc}}