diff --git a/doc/sphinx/_static/headers.js b/doc/sphinx/_static/headers.js
index 6e5f577cfc7cc2796e9a1612b2dc4a849c3e5b57..c797fbb23c44fdf18a0487a0eb599b8eec1ebc8f 100644
--- a/doc/sphinx/_static/headers.js
+++ b/doc/sphinx/_static/headers.js
@@ -11,6 +11,17 @@ $(document).ready(function () {
       }
     }
   );
+  $("[id^='lua-object'], [id^='lua-function'], [id^='lua-data']").each(
+    function(i, el) {
+      var icon = '<i class="fa fa-link"></i>';
+      var hlink = $(el).find(".headerlink");
+      var hlink_id = hlink.attr("href");
+      if (typeof(hlink_id) != 'undefined') {
+        $(hlink).remove();
+        $(el).prepend($("<a />").addClass("headerlink").attr("href", hlink_id).html(icon));
+      }
+    }
+  );
   $(".admonition.note p.first.admonition-title").each(
     function(i, el) {
       var icon = '<i class="fa fa-comments-o"></i>';
diff --git a/doc/sphinx/_static/sphinx_design.css b/doc/sphinx/_static/sphinx_design.css
index 09561bcb29f512808d3a8c4c0f30e2972d6b68a2..029acabe452fe4a462e20ea16589889ee0ff8854 100644
--- a/doc/sphinx/_static/sphinx_design.css
+++ b/doc/sphinx/_static/sphinx_design.css
@@ -187,7 +187,8 @@ a.headerlink {
 .b-article h2,
 .b-article h3,
 .b-article h4,
-.b-article h5 {
+.b-article h5,
+.b-article h6 {
     margin: 16px 0 16px -25px;
     font-weight: bold;
 }
@@ -211,12 +212,24 @@ a.headerlink {
   -ms-transition: opacity 0.2s ease-in-out 0.1s;
 }
 
+[id^="lua-object"  ],
+[id^="lua-function"],
+[id^="lua-data"    ] {
+    margin-left: -25px;
+}
+
+[id^="lua-object"  ]:hover .headerlink,
+[id^="lua-function"]:hover .headerlink,
+[id^="lua-data"    ]:hover .headerlink {
+    opacity: 1;
+}
+
 h2:hover .headerlink,
 h3:hover .headerlink,
 h4:hover .headerlink,
 h5:hover .headerlink,
 h6:hover .headerlink {
-  opacity: 1;
+    opacity: 1;
 }
 
 table.docutils.footnote {