diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs
index 6afd8eddd..d23ac993b 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/alias symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs
index d73b89e16..6a23c43ec 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/concept symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs
index 0cd82fe2a..4845af053 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/enum symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.members}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs
index f1ce41bd5..c7b507c59 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/enumerator symbol=symbol}}
+{{> signature }}
 
 ----
 
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs
index 09838cc20..7adddb5be 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/field symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs
index fecd77eeb..06bfcbe18 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/friend symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs
index f98373ad1..3acfa084a 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/function symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs
index 1ef93f940..916ad1f7e 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/guide symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs
index e6c9f1d64..9f08f7dea 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs
@@ -16,7 +16,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{> (concat 'signature' '/' (lookup member 'kind')) symbol=member link=member}};
+{{> signature symbol=member link=member}};
 ----
 {{/each}}
   
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs
index 4d710efb5..56d553f80 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/record symbol=symbol}};
+{{> signature }};
 ----
 
 {{#with symbol.interface}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs
index 70b008f1e..a47730401 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/typedef symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs
index fe72dea99..0b98619d1 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/using symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs
index 617e54c79..26b89b06b 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs
@@ -10,7 +10,7 @@
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-{{>signature/variable symbol=symbol}};
+{{> signature }};
 ----
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/common/partials/signature.hbs b/share/mrdocs/addons/generator/common/partials/signature.hbs
new file mode 100644
index 000000000..9de33a16d
--- /dev/null
+++ b/share/mrdocs/addons/generator/common/partials/signature.hbs
@@ -0,0 +1 @@
+{{> (concat 'signature' '/' (lookup symbol 'kind')) }}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs
index 2a4af74f2..74596e1cd 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs
@@ -12,7 +12,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/alias symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
     {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs
index c66c717f9..1b19386a2 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs
@@ -12,7 +12,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/concept symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
     {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs
index 76661f986..c3c4ad837 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/enum symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
index ed28a9cc1..8d4c66ef7 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/enumerator symbol=symbol}}
+            {{> signature }}
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs
index 739b82019..6ad25419f 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/field symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs
index 029d0d12c..08ab1aed6 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/friend symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs
index 682824c86..87c49f910 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/function symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs
index 9826a669b..e98aa2ade 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/guide symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs
index d93852e01..5277447eb 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs
@@ -9,7 +9,7 @@
 
 <p>{{{member.doc.brief}}}</p>
 
-<pre><code class="language-cpp">{{> (concat 'signature' '/' (lookup member 'kind')) symbol=member}};</code></pre>
+<pre><code class="language-cpp">{{> signature symbol=member }};</code></pre>
 <a href="{{{relativize member.url}}}"><em>» more...</em></a>
 
 {{/each}}
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs
index effd6a64e..3571399e7 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/record symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs
index 51567149e..eebdfb638 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/typedef symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs
index a5f9756d9..1c2d9e988 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/using symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>
 
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs
index 0d68f9f08..a2d01019d 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs
@@ -13,7 +13,7 @@
             </code>
         </div>
         <pre class="source-code cpp">
-            {{>signature/variable symbol=symbol}};
+            {{> signature }};
         </pre>
     </div>