diff --git a/resources/assets/themes/base.less b/resources/assets/themes/base.less
index c0b43774..f04c3530 100644
--- a/resources/assets/themes/base.less
+++ b/resources/assets/themes/base.less
@@ -262,6 +262,26 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   margin-top: @line-height-computed;
 }
 
+span.ref-id[id] {
+  padding-top: 50px;
+}
+
+.faq {
+  .panel-heading h3 {
+    margin: 0;
+
+    small a.ref-link {
+      display: none;
+    }
+
+    &:hover {
+      small a.ref-link {
+        display: inherit;
+      }
+    }
+  }
+}
+
 @keyframes pulse {
   0% {
     transform: rotate(0deg);
diff --git a/resources/views/pages/faq/overview.twig b/resources/views/pages/faq/overview.twig
index 15ae707b..c1032f88 100644
--- a/resources/views/pages/faq/overview.twig
+++ b/resources/views/pages/faq/overview.twig
@@ -28,10 +28,14 @@
 
             {% block row %}
                 {% for item in items %}
-                    <div class="col-md-12" id="faq-{{ item.id }}">
+                    <div class="col-md-12 faq">
+                        <span id="faq-{{ item.id }}" class="ref-id"></span>
                         <div class="panel panel-default">
                             <div class="panel-heading">
-                                {{ item.question }}
+                                <h3>
+                                    {{ item.question }}
+                                    <small><a class="ref-link" href="#faq-{{ item.id }}">{{ m.glyphicon('link') }}</a></small>
+                                </h3>
                             </div>
 
                             <div class="panel-body">