diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs
new file mode 100644
index 0000000000..deaae574b5
--- /dev/null
+++ b/share/mrdocs/addons/generator/adoc/partials/markup/code-block.adoc.hbs
@@ -0,0 +1,6 @@
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+{{> @partial-block }}
+
+----
+
diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/em.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/em.adoc.hbs
new file mode 100644
index 0000000000..0e4c3e2ef3
--- /dev/null
+++ b/share/mrdocs/addons/generator/adoc/partials/markup/em.adoc.hbs
@@ -0,0 +1 @@
+_{{> @partial-block }}_
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
index 7678217266..ace550722c 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
@@ -23,28 +23,12 @@
 
 {{/if}}
 {{! Synopsis }}
-{{#unless (contains (arr "namespace") symbol.kind)}}
+{{#unless (eq symbol.kind "namespace")}}
 {{#> markup/dynamic-level-h }}Synopsis{{/markup/dynamic-level-h}}
 
 {{>location/source dcl=(primary_location symbol)}}
 
-{{#if (ne symbol.kind "overloads")}}
-[source,cpp,subs="verbatim,macros,-callouts"]
-----
-{{> symbol/signature symbol }}
-
-----
-
-{{else}}
-{{#each symbol.members as | member |}}
-[source,cpp,subs="verbatim,macros,-callouts"]
-----
-{{> symbol/signature member link=member}}
-
-----
-
-{{/each}}
-{{/if}}
+{{> symbol/signatures symbol }}
 {{/unless}}
 {{! Tranches }}
 {{#if symbol.interface}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs
new file mode 100644
index 0000000000..038b78d88f
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs
@@ -0,0 +1,29 @@
+{{!--
+    Renders code blocks with signatures related to a symbol
+
+    For most symbols, this will render a single code block with the symbol's signature.
+
+    For function overloads, this will render a code block for each overload.
+
+    Expected Context: {Symbol Object}
+
+    Example:
+        {{> symbol/signatures symbol }}
+
+    See: https://mrdocs.com/docs/mrdocs/develop/generators.html#dom_reference
+--}}
+{{#if (ne kind "overloads")}}
+{{#> markup/code-block }}
+{{> symbol/signature }}
+{{/markup/code-block}}
+
+{{else}}
+{{#each members as | member |}}
+{{#> markup/code-block }}
+{{> symbol/signature member link=member}}
+{{/markup/code-block}}
+
+{{#> markup/span class="small" }}{{#> markup/a href=(relativize member.url) }}{{#>markup/em }}» more...{{/markup/em}}{{/markup/a}}{{/markup/span}}
+
+{{/each}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/markup/code-block.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/code-block.html.hbs
new file mode 100644
index 0000000000..1bf1feefc3
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/markup/code-block.html.hbs
@@ -0,0 +1,6 @@
+<pre>
+<code class="source-code cpp">
+{{> @partial-block }}
+
+</code>
+</pre>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/markup/em.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/em.html.hbs
new file mode 100644
index 0000000000..a1f7c59740
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/markup/em.html.hbs
@@ -0,0 +1 @@
+<em>{{> @partial-block }}</em>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs b/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs
index b6813ca435..5c5d613608 100644
--- a/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/markup/span.html.hbs
@@ -1,4 +1 @@
-<span{{#if class}} class="{{class}}"{{/if}}>
-    {{> @partial-block }}
-
-</span>
\ No newline at end of file
+<span{{#if class}} class="{{class}}"{{/if}}>{{> @partial-block }}</span>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
index 928c4d1ab5..933382b6c2 100644
--- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
@@ -29,30 +29,14 @@
 </div>
 {{/unless}}
 {{! Synopsis }}
-{{#unless (contains (arr "namespace") symbol.kind)}}
+{{#unless (eq symbol.kind "namespace")}}
 <div>
 {{#> markup/dynamic-level-h level=2 }}Synopsis{{/markup/dynamic-level-h}}
 <div>
 {{>location/source dcl=(primary_location symbol)}}
 </div>
-{{#if (ne symbol.kind "overloads")}}
-<pre>
-<code class="source-code cpp">
-{{> symbol/signature symbol }}
-
-</code>
-</pre>
-{{else}}
-{{#each symbol.members as | member |}}
-<pre>
-<code class="language-cpp">
-{{> symbol/signature member }}
+{{> symbol/signatures symbol }}
 
-</code>
-</pre>
-<a href="{{{relativize member.url}}}"><em>» more...</em></a>
-{{/each}}
-{{/if}}
 </div>
 {{/unless}}
 {{! Tranches }}
diff --git a/test-files/golden-tests/explicit-ctor.adoc b/test-files/golden-tests/explicit-ctor.adoc
index 164e46dd2b..570a94b6ce 100644
--- a/test-files/golden-tests/explicit-ctor.adoc
+++ b/test-files/golden-tests/explicit-ctor.adoc
@@ -57,18 +57,24 @@ explicit
 <<#Explicit-2constructor-02,Explicit>>();
 ----
 
+[.small]#<<#Explicit-2constructor-02,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
 <<#Explicit-2constructor-00,Explicit>>(<<#Explicit,Explicit>> const&);
 ----
 
+[.small]#<<#Explicit-2constructor-00,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
 <<#Explicit-2constructor-0b,Explicit>>(<<#Explicit,Explicit>>&&) noexcept;
 ----
 
+[.small]#<<#Explicit-2constructor-0b,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 explicit
@@ -77,6 +83,8 @@ explicit
     int);
 ----
 
+[.small]#<<#Explicit-2constructor-03,_» more..._>>#
+
 [#Explicit-2constructor-02]
 == <<#Explicit,Explicit>>::Explicit
 
@@ -161,18 +169,24 @@ pass:[explicit(true)]
 <<#ExplicitTrue-2constructor-0d,ExplicitTrue>>();
 ----
 
+[.small]#<<#ExplicitTrue-2constructor-0d,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(true)]
 <<#ExplicitTrue-2constructor-04,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>> const&);
 ----
 
+[.small]#<<#ExplicitTrue-2constructor-04,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(true)]
 <<#ExplicitTrue-2constructor-08,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept;
 ----
 
+[.small]#<<#ExplicitTrue-2constructor-08,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(true)]
@@ -181,6 +195,8 @@ pass:[explicit(true)]
     int);
 ----
 
+[.small]#<<#ExplicitTrue-2constructor-05,_» more..._>>#
+
 [#ExplicitTrue-2constructor-0d]
 == <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue
 
@@ -265,18 +281,24 @@ pass:[explicit(false)]
 <<#ExplicitFalse-2constructor-01,ExplicitFalse>>();
 ----
 
+[.small]#<<#ExplicitFalse-2constructor-01,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(false)]
 <<#ExplicitFalse-2constructor-08,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>> const&);
 ----
 
+[.small]#<<#ExplicitFalse-2constructor-08,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(false)]
 <<#ExplicitFalse-2constructor-0a,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept;
 ----
 
+[.small]#<<#ExplicitFalse-2constructor-0a,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(false)]
@@ -285,6 +307,8 @@ pass:[explicit(false)]
     int);
 ----
 
+[.small]#<<#ExplicitFalse-2constructor-04,_» more..._>>#
+
 [#ExplicitFalse-2constructor-01]
 == <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse
 
@@ -370,18 +394,24 @@ pass:[explicit(B)]
 <<#ExplicitExpression-2constructor-0b,ExplicitExpression>>();
 ----
 
+[.small]#<<#ExplicitExpression-2constructor-0b,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(B)]
 <<#ExplicitExpression-2constructor-04,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>> const&);
 ----
 
+[.small]#<<#ExplicitExpression-2constructor-04,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(B)]
 <<#ExplicitExpression-2constructor-08,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept;
 ----
 
+[.small]#<<#ExplicitExpression-2constructor-08,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 pass:[explicit(B)]
@@ -390,6 +420,8 @@ pass:[explicit(B)]
     int);
 ----
 
+[.small]#<<#ExplicitExpression-2constructor-02,_» more..._>>#
+
 [#ExplicitExpression-2constructor-0b]
 == <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression
 
diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html
index b16c5f979c..fcd5f88092 100644
--- a/test-files/golden-tests/explicit-ctor.html
+++ b/test-files/golden-tests/explicit-ctor.html
@@ -52,9 +52,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#Explicit-2constructor"><code>Explicit</code></a>         <span class="small">
-        [constructor]
-    </span></td><td></td></tr>
+<td><a href="#Explicit-2constructor"><code>Explicit</code></a>         <span class="small">[constructor]</span></td><td></td></tr>
 </tbody>
 </table>
 
@@ -69,35 +67,36 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;explicit-ctor.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit
-Explicit();
+<a href="#Explicit-2constructor-02">Explicit</a>();
 </code>
-</pre>
-<a href="#Explicit-2constructor-02"><em>» more...</em></a>
+</pre><span class="small"><a href="#Explicit-2constructor-02"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit
-Explicit(<a href="#Explicit">Explicit</a> const&);
+<a href="#Explicit-2constructor-00">Explicit</a>(<a href="#Explicit">Explicit</a> const&);
 </code>
-</pre>
-<a href="#Explicit-2constructor-00"><em>» more...</em></a>
+</pre><span class="small"><a href="#Explicit-2constructor-00"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit
-Explicit(<a href="#Explicit">Explicit</a>&&) noexcept;
+<a href="#Explicit-2constructor-0b">Explicit</a>(<a href="#Explicit">Explicit</a>&&) noexcept;
 </code>
-</pre>
-<a href="#Explicit-2constructor-0b"><em>» more...</em></a>
+</pre><span class="small"><a href="#Explicit-2constructor-0b"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit
-Explicit(
+<a href="#Explicit-2constructor-03">Explicit</a>(
     int,
     int);
 </code>
-</pre>
-<a href="#Explicit-2constructor-03"><em>» more...</em></a>
+</pre><span class="small"><a href="#Explicit-2constructor-03"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -189,9 +188,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#ExplicitTrue-2constructor"><code>ExplicitTrue</code></a>         <span class="small">
-        [constructor]
-    </span></td><td></td></tr>
+<td><a href="#ExplicitTrue-2constructor"><code>ExplicitTrue</code></a>         <span class="small">[constructor]</span></td><td></td></tr>
 </tbody>
 </table>
 
@@ -206,35 +203,36 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;explicit-ctor.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(true)
-ExplicitTrue();
+<a href="#ExplicitTrue-2constructor-0d">ExplicitTrue</a>();
 </code>
-</pre>
-<a href="#ExplicitTrue-2constructor-0d"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitTrue-2constructor-0d"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(true)
-ExplicitTrue(<a href="#ExplicitTrue">ExplicitTrue</a> const&);
+<a href="#ExplicitTrue-2constructor-04">ExplicitTrue</a>(<a href="#ExplicitTrue">ExplicitTrue</a> const&);
 </code>
-</pre>
-<a href="#ExplicitTrue-2constructor-04"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitTrue-2constructor-04"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(true)
-ExplicitTrue(<a href="#ExplicitTrue">ExplicitTrue</a>&&) noexcept;
+<a href="#ExplicitTrue-2constructor-08">ExplicitTrue</a>(<a href="#ExplicitTrue">ExplicitTrue</a>&&) noexcept;
 </code>
-</pre>
-<a href="#ExplicitTrue-2constructor-08"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitTrue-2constructor-08"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(true)
-ExplicitTrue(
+<a href="#ExplicitTrue-2constructor-05">ExplicitTrue</a>(
     int,
     int);
 </code>
-</pre>
-<a href="#ExplicitTrue-2constructor-05"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitTrue-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -326,9 +324,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#ExplicitFalse-2constructor"><code>ExplicitFalse</code></a>         <span class="small">
-        [constructor]
-    </span></td><td></td></tr>
+<td><a href="#ExplicitFalse-2constructor"><code>ExplicitFalse</code></a>         <span class="small">[constructor]</span></td><td></td></tr>
 </tbody>
 </table>
 
@@ -343,35 +339,36 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;explicit-ctor.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(false)
-ExplicitFalse();
+<a href="#ExplicitFalse-2constructor-01">ExplicitFalse</a>();
 </code>
-</pre>
-<a href="#ExplicitFalse-2constructor-01"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitFalse-2constructor-01"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(false)
-ExplicitFalse(<a href="#ExplicitFalse">ExplicitFalse</a> const&);
+<a href="#ExplicitFalse-2constructor-08">ExplicitFalse</a>(<a href="#ExplicitFalse">ExplicitFalse</a> const&);
 </code>
-</pre>
-<a href="#ExplicitFalse-2constructor-08"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitFalse-2constructor-08"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(false)
-ExplicitFalse(<a href="#ExplicitFalse">ExplicitFalse</a>&&) noexcept;
+<a href="#ExplicitFalse-2constructor-0a">ExplicitFalse</a>(<a href="#ExplicitFalse">ExplicitFalse</a>&&) noexcept;
 </code>
-</pre>
-<a href="#ExplicitFalse-2constructor-0a"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitFalse-2constructor-0a"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(false)
-ExplicitFalse(
+<a href="#ExplicitFalse-2constructor-04">ExplicitFalse</a>(
     int,
     int);
 </code>
-</pre>
-<a href="#ExplicitFalse-2constructor-04"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitFalse-2constructor-04"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -464,9 +461,7 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#ExplicitExpression-2constructor"><code>ExplicitExpression</code></a>         <span class="small">
-        [constructor]
-    </span></td><td></td></tr>
+<td><a href="#ExplicitExpression-2constructor"><code>ExplicitExpression</code></a>         <span class="small">[constructor]</span></td><td></td></tr>
 </tbody>
 </table>
 
@@ -481,35 +476,36 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;explicit-ctor.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(B)
-ExplicitExpression();
+<a href="#ExplicitExpression-2constructor-0b">ExplicitExpression</a>();
 </code>
-</pre>
-<a href="#ExplicitExpression-2constructor-0b"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitExpression-2constructor-0b"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(B)
-ExplicitExpression(<a href="#ExplicitExpression">ExplicitExpression</a> const&);
+<a href="#ExplicitExpression-2constructor-04">ExplicitExpression</a>(<a href="#ExplicitExpression">ExplicitExpression</a> const&);
 </code>
-</pre>
-<a href="#ExplicitExpression-2constructor-04"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitExpression-2constructor-04"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(B)
-ExplicitExpression(<a href="#ExplicitExpression">ExplicitExpression</a>&&) noexcept;
+<a href="#ExplicitExpression-2constructor-08">ExplicitExpression</a>(<a href="#ExplicitExpression">ExplicitExpression</a>&&) noexcept;
 </code>
-</pre>
-<a href="#ExplicitExpression-2constructor-08"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitExpression-2constructor-08"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 explicit(B)
-ExplicitExpression(
+<a href="#ExplicitExpression-2constructor-02">ExplicitExpression</a>(
     int,
     int);
 </code>
-</pre>
-<a href="#ExplicitExpression-2constructor-02"><em>» more...</em></a>
+</pre><span class="small"><a href="#ExplicitExpression-2constructor-02"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/explicit-object-parameter.adoc b/test-files/golden-tests/explicit-object-parameter.adoc
index 6ead89e2dd..3575c49514 100644
--- a/test-files/golden-tests/explicit-object-parameter.adoc
+++ b/test-files/golden-tests/explicit-object-parameter.adoc
@@ -50,6 +50,8 @@ auto&&
 <<#Optional-value-05,value>>(this Self&& self);
 ----
 
+[.small]#<<#Optional-value-05,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<typename Self>
@@ -60,6 +62,8 @@ auto&&
     int x);
 ----
 
+[.small]#<<#Optional-value-06,_» more..._>>#
+
 [#Optional-value-05]
 == <<#Optional,Optional>>::value
 
diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html
index 6fd090916e..2d7ee601cf 100644
--- a/test-files/golden-tests/explicit-object-parameter.html
+++ b/test-files/golden-tests/explicit-object-parameter.html
@@ -61,25 +61,26 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;explicit-object-parameter.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename Self&gt;
 constexpr
 auto&&
-value(this Self&& self);
+<a href="#Optional-value-05">value</a>(this Self&& self);
 </code>
-</pre>
-<a href="#Optional-value-05"><em>» more...</em></a>
+</pre><span class="small"><a href="#Optional-value-05"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename Self&gt;
 constexpr
 auto&&
-value(this 
+<a href="#Optional-value-06">value</a>(this 
     Self&& self,
     int x);
 </code>
-</pre>
-<a href="#Optional-value-06"><em>» more...</em></a>
+</pre><span class="small"><a href="#Optional-value-06"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/requires-clause.adoc b/test-files/golden-tests/requires-clause.adoc
index d3c79fe77d..fe356db905 100644
--- a/test-files/golden-tests/requires-clause.adoc
+++ b/test-files/golden-tests/requires-clause.adoc
@@ -37,6 +37,8 @@ void
 <<#f-05,f>>() requires pass:[(sizeof(T) == 4)];
 ----
 
+[.small]#<<#f-05,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<typename T>
@@ -44,6 +46,8 @@ void
 <<#f-08,f>>() requires pass:[(sizeof(T) == 2)];
 ----
 
+[.small]#<<#f-08,_» more..._>>#
+
 [#f-05]
 == f
 
@@ -83,6 +87,8 @@ void
 <<#g-0a,g>>();
 ----
 
+[.small]#<<#g-0a,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<typename T> requires pass:[(sizeof(U) == 2)]
@@ -90,6 +96,8 @@ void
 <<#g-0c,g>>();
 ----
 
+[.small]#<<#g-0c,_» more..._>>#
+
 [#g-0a]
 == g
 
diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html
index 48138fc90a..aab4426ff3 100644
--- a/test-files/golden-tests/requires-clause.html
+++ b/test-files/golden-tests/requires-clause.html
@@ -45,21 +45,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;requires-clause.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt;
 void
-f() requires (sizeof(T) &#x3D;&#x3D; 4);
+<a href="#f-05">f</a>() requires (sizeof(T) &#x3D;&#x3D; 4);
 </code>
-</pre>
-<a href="#f-05"><em>» more...</em></a>
+</pre><span class="small"><a href="#f-05"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt;
 void
-f() requires (sizeof(T) &#x3D;&#x3D; 2);
+<a href="#f-08">f</a>() requires (sizeof(T) &#x3D;&#x3D; 2);
 </code>
-</pre>
-<a href="#f-08"><em>» more...</em></a>
+</pre><span class="small"><a href="#f-08"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -105,21 +106,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;requires-clause.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt; requires (sizeof(T) &#x3D;&#x3D; 4)
 void
-g();
+<a href="#g-0a">g</a>();
 </code>
-</pre>
-<a href="#g-0a"><em>» more...</em></a>
+</pre><span class="small"><a href="#g-0a"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt; requires (sizeof(U) &#x3D;&#x3D; 2)
 void
-g();
+<a href="#g-0c">g</a>();
 </code>
-</pre>
-<a href="#g-0c"><em>» more...</em></a>
+</pre><span class="small"><a href="#g-0c"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.adoc b/test-files/golden-tests/temp/c_mft_expl_inline.adoc
index 5a98353480..c4eecc8ab2 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.adoc
@@ -49,6 +49,8 @@ void
 <<#A-f-0e,f>>();
 ----
 
+[.small]#<<#A-f-0e,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
@@ -56,6 +58,8 @@ void
 <<#A-f-0b,f>><int>();
 ----
 
+[.small]#<<#A-f-0b,_» more..._>>#
+
 [#A-f-0e]
 == <<#A,A>>::f
 
diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.html b/test-files/golden-tests/temp/c_mft_expl_inline.html
index 8cad73f481..ee73d0f080 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.html
@@ -61,21 +61,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;temp/c_mft_expl_inline.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt;
 void
-f();
+<a href="#A-f-0e">f</a>();
 </code>
-</pre>
-<a href="#A-f-0e"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-0e"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-0e">f</a>&lt;int&gt;();
+<a href="#A-f-0b">f</a>&lt;int&gt;();
 </code>
-</pre>
-<a href="#A-f-0b"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-0b"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.adoc b/test-files/golden-tests/temp/c_mft_expl_outside.adoc
index c17635b3e5..a88d9c2501 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.adoc
@@ -49,6 +49,8 @@ void
 <<#A-f-0e,f>>();
 ----
 
+[.small]#<<#A-f-0e,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
@@ -56,6 +58,8 @@ void
 <<#A-f-0b,f>><int>();
 ----
 
+[.small]#<<#A-f-0b,_» more..._>>#
+
 [#A-f-0e]
 == <<#A,A>>::f
 
diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.html b/test-files/golden-tests/temp/c_mft_expl_outside.html
index fcf2cfee8d..dcd7c3e292 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.html
@@ -61,21 +61,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;temp/c_mft_expl_outside.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt;
 void
-f();
+<a href="#A-f-0e">f</a>();
 </code>
-</pre>
-<a href="#A-f-0e"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-0e"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-0e">f</a>&lt;int&gt;();
+<a href="#A-f-0b">f</a>&lt;int&gt;();
 </code>
-</pre>
-<a href="#A-f-0b"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-0b"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
index 6ef88545b9..14d3f07f0d 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
@@ -50,6 +50,8 @@ void
 <<#A-f-07,f>>();
 ----
 
+[.small]#<<#A-f-07,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
@@ -57,6 +59,8 @@ void
 <<#A-f-04,f>><int>();
 ----
 
+[.small]#<<#A-f-04,_» more..._>>#
+
 [#A-f-07]
 == <<#A,A>>::f
 
diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.html b/test-files/golden-tests/temp/ct_mft_expl_inline.html
index eb45d80bd2..c680aefa4c 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html
@@ -62,21 +62,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;temp/ct_mft_expl_inline.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename U&gt;
 void
-f();
+<a href="#A-f-07">f</a>();
 </code>
-</pre>
-<a href="#A-f-07"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-07"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#A-f-07">f</a>&lt;int&gt;();
+<a href="#A-f-04">f</a>&lt;int&gt;();
 </code>
-</pre>
-<a href="#A-f-04"><em>» more...</em></a>
+</pre><span class="small"><a href="#A-f-04"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/temp/ft_expl.adoc b/test-files/golden-tests/temp/ft_expl.adoc
index 10c1f44e0e..1927801353 100644
--- a/test-files/golden-tests/temp/ft_expl.adoc
+++ b/test-files/golden-tests/temp/ft_expl.adoc
@@ -26,6 +26,8 @@ void
 <<#f-03,f>>();
 ----
 
+[.small]#<<#f-03,_» more..._>>#
+
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<>
@@ -33,6 +35,8 @@ void
 <<#f-0c,f>><int>();
 ----
 
+[.small]#<<#f-0c,_» more..._>>#
+
 [#f-03]
 == f
 
diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html
index fdbb6e92d0..ff5342c29d 100644
--- a/test-files/golden-tests/temp/ft_expl.html
+++ b/test-files/golden-tests/temp/ft_expl.html
@@ -31,21 +31,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;temp/ft_expl.cpp&gt;</code></div>
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;typename T&gt;
 void
-f();
+<a href="#f-03">f</a>();
 </code>
-</pre>
-<a href="#f-03"><em>» more...</em></a>
+</pre><span class="small"><a href="#f-03"><em>» more...</em></a></span>
+
 <pre>
-<code class="language-cpp">
+<code class="source-code cpp">
 template&lt;&gt;
 void
-<a href="#f-03">f</a>&lt;int&gt;();
+<a href="#f-0c">f</a>&lt;int&gt;();
 </code>
-</pre>
-<a href="#f-0c"><em>» more...</em></a>
+</pre><span class="small"><a href="#f-0c"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
diff --git a/test-files/golden-tests/union.html b/test-files/golden-tests/union.html
index 2065400570..2752d17f23 100644
--- a/test-files/golden-tests/union.html
+++ b/test-files/golden-tests/union.html
@@ -48,13 +48,9 @@ <h2>Data Members</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-x"><code>x</code></a> <span class="small">
-    [variant member]
-</span></td><td>
+<td><a href="#A-x"><code>x</code></a> <span class="small">[variant member]</span></td><td>
 </td></tr><tr>
-<td><a href="#A-y"><code>y</code></a> <span class="small">
-    [variant member]
-</span></td><td>
+<td><a href="#A-y"><code>y</code></a> <span class="small">[variant member]</span></td><td>
 </td></tr>
 </tbody>
 </table>
@@ -114,13 +110,9 @@ <h2>Data Members</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#B-x"><code>x</code></a> <span class="small">
-    [variant member]
-</span></td><td>
+<td><a href="#B-x"><code>x</code></a> <span class="small">[variant member]</span></td><td>
 </td></tr><tr>
-<td><a href="#B-y"><code>y</code></a> <span class="small">
-    [variant member]
-</span></td><td>
+<td><a href="#B-y"><code>y</code></a> <span class="small">[variant member]</span></td><td>
 </td></tr><tr>
 <td><a href="#B-z"><code>z</code></a> </td><td>
 </td></tr>