diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index d9c7502209941a6022672aa18075edba1f12d058..31246125bead97274e6d4d97282d82ac1ab86b76 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -132,9 +132,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             $this->lastsec = $pos;
         }
 
-        $this->doc .= DOKU_LF.'<a name="'.$this->_headerToLink($text).'" id="'.$this->_headerToLink($text).'"></a><h'.$level.'>';
+        $this->doc .= DOKU_LF.'<h'.$level.'><a name="'.$this->_headerToLink($text).'" id="'.$this->_headerToLink($text).'">';
         $this->doc .= $this->_xmlEntities($text);
-        $this->doc .= "</h$level>".DOKU_LF;
+        $this->doc .= "</a></h$level>".DOKU_LF;
     }
     
     function section_open($level) {
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 5bf8797d3e15f8adfa1e4ab441af0fcc7cb814ae..9462e6c52021ff75a78349044ddf0561838b4b20 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -197,6 +197,10 @@ a:hover {
   color:__black__;
   text-decoration:underline;
 }
+h1 a, h2 a, h3 a, h4 a, h5 a, h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {
+  color:__black__;
+  text-decoration:none;
+}
 
 /* external link */
 a.urlextern{