diff --git a/docs/community/topics/kitchen-sink.md b/docs/community/topics/kitchen-sink.md
index 951fde7e9..87d73c52c 100644
--- a/docs/community/topics/kitchen-sink.md
+++ b/docs/community/topics/kitchen-sink.md
@@ -7,8 +7,8 @@ The source files for these pages are stored [in the `sphinx-themes.org` reposito
 To update the kitchen sink source files, there is a helper Python script that will loop through the known kitchen sink files and copy over the latest text.
 To use it, run the following from the root of the repository:
 
-- [issue closed](https://github.com/pydata/pydata-sphinx-theme/issues/1882)
-- [issue open](https://github.com/pydata/pydata-sphinx-theme/issues/1895)
-- [pull open](https://github.com/pydata/pydata-sphinx-theme/issues/1888)
-- [pull merged](https://github.com/pydata/pydata-sphinx-theme/issues/1893)
-- [pull closed](https://github.com/pydata/pydata-sphinx-theme/issues/1853)
+- This links to a [closed issue](https://github.com/pydata/pydata-sphinx-theme/issues/1882) on GitHub
+- That to an [opened issue](https://github.com/pydata/pydata-sphinx-theme/issues/1895)
+- Pull Requests can also be [open](https://github.com/pydata/pydata-sphinx-theme/issues/1888)
+- But also [merged](https://github.com/pydata/pydata-sphinx-theme/issues/1893)
+- Or simply [closed](https://github.com/pydata/pydata-sphinx-theme/issues/1853)
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
index 542a406f5..89d8948cb 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
@@ -84,19 +84,19 @@
 
 
     .pst-gh-issue:before {
-        font-family: "Font Awesome 5 Free"; /* Ensure correct font family */
+        font-family: "Font Awesome 6 Free"; /* Ensure correct font family */
         font-weight: 900; /* Adjust font weight if necessary */
-        content: "\f05a"; /* Unicode for the (i) icon */
-        margin-right: 5px; /* Optional: Adjust spacing between icon and text */
-        text-decoration: none;
+        /* Unicode for the (i) icon + non breaking space, we don't use padding or
+         margin otherwise there is a gap in the underline */
+        content: "\f05a\0020";
     }
 
     .pst-gh-pull:before {
-        font-family: "Font Awesome 5 Free"; /* Ensure correct font family */
+        font-family: "Font Awesome 6 Free"; /* Ensure correct font family */
         font-weight: 900; /* Adjust font weight if necessary */
-        content: "\f126"; /* Unicode for the pull-request icon */
-        margin-right: 5px; /* Optional: Adjust spacing between icon and text */
-        text-decoration: none;
+        /* Unicode for the pull-request icon + non breaking space, we don't use padding or
+         margin otherwise there is a gap in the underline */
+        content: "\e13c\0020";
     }
   </style>
   {{ _webpack.head_pre_assets() }}