diff --git a/_layouts/docs.html b/_layouts/docs.html
index cca1d264e8..0b7c97450d 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -22,13 +22,14 @@
                 <div class="col-body">
                     <main class="col-content content">
                         <section class="section">
-                            {%- if page.title -%}
-                            <h1>{{ page.title }}</h1>
-                            {%- endif -%}
-                            {%- if page.advisory -%}
-                            <blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>
-                            {%- endif -%}
-                            <p></p>
+                            <div class="content-title">
+                              {%- if page.title -%}
+                              <h1>{{ page.title }}</h1>
+                              {%- endif -%}
+                              {%- if site.hotjar_id and site.hotjar_id != '' and page.skip_feedback != true -%}
+                                <button id="hotjar-feedback">Give feedback</button>
+                              {%- endif -%}
+                            </div>
                             {{ content }}
                         </section>
                     </main>
diff --git a/_scss/_buttons.scss b/_scss/_buttons.scss
index ca13c7c012..77b6843209 100755
--- a/_scss/_buttons.scss
+++ b/_scss/_buttons.scss
@@ -69,3 +69,24 @@ a.button.outline-btn.min-hgt {
 .outline-btn:hover {
     opacity: 0.8;
 }
+
+// Hotjar feedback button
+#hotjar-feedback {
+  align-self: center;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  color: $light-blue-500;
+  font-weight: bold;
+  background: none;
+  padding: 8px 16px;
+  border: 2px solid $light-blue-500;
+  border-radius: 2px;
+  .night & {
+    color: $white;
+    border: 2px solid $dark-blue-500;
+  }
+  &:hover {
+    opacity: 0.7;
+  }
+}
diff --git a/_scss/_content.scss b/_scss/_content.scss
index 70fe8f07e5..e6f938696b 100755
--- a/_scss/_content.scss
+++ b/_scss/_content.scss
@@ -202,4 +202,9 @@ main img:hover {opacity: 0.7;}
   }
 }
 
-
+// Make the title wrapper flex
+.content-title {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}