diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala
index 483f3ea5d..6b7ab2dc7 100644
--- a/src/main/scala/view/Markdown.scala
+++ b/src/main/scala/view/Markdown.scala
@@ -143,12 +143,10 @@ object GitBucketHtmlSerializer {
 
   private val Whitespace = "[\\s]".r
 
-  private val SpecialChars = "[^\\w-]".r
-
   def generateAnchorName(text: String): String = {
     val noWhitespace = Whitespace.replaceAllIn(text, "-")
     val normalized = Normalizer.normalize(noWhitespace, Normalizer.Form.NFD)
-    val noSpecialChars = SpecialChars.replaceAllIn(normalized, "")
+    val noSpecialChars = StringUtil.urlEncode(normalized)
     noSpecialChars.toLowerCase(Locale.ENGLISH)
   }
 }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 8df22fc6b..01c96b414 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -857,7 +857,6 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {
 
 a.markdown-anchor-link {
   position: absolute;
-  top: 16px;
   left: -20px;
   width: 32px;
   height: 16px;
@@ -865,3 +864,7 @@ a.markdown-anchor-link {
   background-repeat: no-repeat;
   display: none;
 }
+
+h1 a.markdown-anchor-link, h2 a.markdown-anchor-link, h3 a.markdown-anchor-link {
+  top: 10px;
+}