diff --git a/exampleSite/content/shortcodes/attachments.en.md b/exampleSite/content/shortcodes/attachments.en.md
index 1668257da7..ebf4649c04 100644
--- a/exampleSite/content/shortcodes/attachments.en.md
+++ b/exampleSite/content/shortcodes/attachments.en.md
@@ -97,10 +97,10 @@ Eg. for a site in English and Piratish:
 ### Custom Title, List of Attachments Ending in pdf or mp4
 
 ````go
-{{%/* attachments title="Related files" pattern=".*\.(pdf|mp4)" /*/%}}
+{{%/* attachments title="Related **files**" pattern=".*\.(pdf|mp4)" /*/%}}
 ````
 
-{{% attachments title="Related files" pattern=".*\.(pdf|mp4)" /%}}
+{{% attachments title="Related **files**" pattern=".*\.(pdf|mp4)" /%}}
 
 ### Info Styled Box, Descending Sort Order
 
diff --git a/exampleSite/content/shortcodes/badge.en.md b/exampleSite/content/shortcodes/badge.en.md
index f5c2f4b0d0..deb9490615 100644
--- a/exampleSite/content/shortcodes/badge.en.md
+++ b/exampleSite/content/shortcodes/badge.en.md
@@ -188,13 +188,13 @@ While the examples are using shortcodes with named parameter you are free to als
 
 ### Other
 
-#### With User-Defined Color and Font Awesome Brand Icon
+#### With User-Defined Color, Font Awesome Brand Icon and Markdown Title and Content
 
 ````go
-{{%/* badge color="fuchsia" icon="fab fa-hackerrank" %}}Awesome{{% /badge */%}}
+{{%/* badge color="fuchsia" icon="fab fa-hackerrank" title="**Font**" %}}**Awesome**{{% /badge */%}}
 ````
 
-{{% badge color="fuchsia" icon="fab fa-hackerrank" %}}Awesome{{% /badge %}}
+{{% badge color="fuchsia" icon="fab fa-hackerrank" title="**Font**" %}}**Awesome**{{% /badge %}}
 
 #### With Icon Content
 
diff --git a/exampleSite/content/shortcodes/button.en.md b/exampleSite/content/shortcodes/button.en.md
index a1348774fe..3a29bf45a7 100644
--- a/exampleSite/content/shortcodes/button.en.md
+++ b/exampleSite/content/shortcodes/button.en.md
@@ -150,13 +150,13 @@ Once the button is clicked, it opens another browser tab for the given URL.
 
 ### Other
 
-#### With User-Defined Color and Font Awesome Brand Icon
+#### With User-Defined Color, Font Awesome Brand Icon and Markdown Title
 
 ````go
-{{%/* button href="https://gohugo.io/" color="fuchsia" icon="fab fa-hackerrank" %}}Hugo{{% /button */%}}
+{{%/* button href="https://gohugo.io/" color="fuchsia" icon="fab fa-hackerrank" %}}Get **Hugo**{{% /button */%}}
 ````
 
-{{% button href="https://gohugo.io/" color="fuchsia" icon="fab fa-hackerrank" %}}Hugo{{% /button %}}
+{{% button href="https://gohugo.io/" color="fuchsia" icon="fab fa-hackerrank" %}}Get **Hugo**{{% /button %}}
 
 #### Severity Style with All Defaults
 
diff --git a/exampleSite/content/shortcodes/expand.en.md b/exampleSite/content/shortcodes/expand.en.md
index 537bdb48a7..67b2336486 100644
--- a/exampleSite/content/shortcodes/expand.en.md
+++ b/exampleSite/content/shortcodes/expand.en.md
@@ -72,7 +72,7 @@ While the examples are using shortcodes with named parameter you are free to use
 ### Arbitrary Text
 
 ````go
-{{%/* expand title="Show me almost endless possibilities" */%}}
+{{%/* expand title="Show me almost **endless** possibilities" */%}}
 You can add standard markdown syntax:
 
 - multiple paragraphs
@@ -89,7 +89,7 @@ You can add standard markdown syntax:
 {{%/* /expand */%}}
 ````
 
-{{% expand title="Show me almost endless possibilities" %}}
+{{% expand title="Show me almost **endless** possibilities" %}}
 You can add standard markdown syntax:
 
 - multiple paragraphs
diff --git a/exampleSite/content/shortcodes/notice.en.md b/exampleSite/content/shortcodes/notice.en.md
index 9482d65cc0..96fe19d24e 100644
--- a/exampleSite/content/shortcodes/notice.en.md
+++ b/exampleSite/content/shortcodes/notice.en.md
@@ -286,14 +286,14 @@ Some serious information.
 Some serious information.
 {{% /notice %}}
 
-### With User-Defined Color and Font Awesome Brand Icon
+### With User-Defined Color, Font Awesome Brand Icon and Markdown Title
 
 ````go
-{{%/* notice color="fuchsia" title="Hugo" icon="fab fa-hackerrank" */%}}
+{{%/* notice color="fuchsia" title="**Hugo**" icon="fab fa-hackerrank" */%}}
 Victor? Is it you?
 {{%/* /notice */%}}
 ````
 
-{{% notice color="fuchsia" title="Hugo" icon="fab fa-hackerrank" %}}
+{{% notice color="fuchsia" title="**Hugo**" icon="fab fa-hackerrank" %}}
 Victor? Is it you?
 {{% /notice %}}
diff --git a/layouts/partials/shortcodes/attachments.html b/layouts/partials/shortcodes/attachments.html
index 0b2cf802c1..c05809310d 100644
--- a/layouts/partials/shortcodes/attachments.html
+++ b/layouts/partials/shortcodes/attachments.html
@@ -30,7 +30,7 @@
 {{- $urlPrefix := strings.TrimRight "/" $context.Page.RelPermalink }}
 {{- with $context }}
 <div class="box attachments cstyle {{ $style }}"{{ if $color }} style="--VARIABLE-BOX-color: {{ $color }};"{{ end }}>
-  <div class="box-label">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ $title }}</div>
+  <div class="box-label">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ $title | markdownify }}</div>
   <ul class="box-content attachments-files">
   {{- $fileLink := printf "%s/%s" (.Page.Language.ContentDir | default "content") .Page.File.Dir }}
   {{- $fileLink = replace (replace $fileLink "\\" "/") "content/" "" }}
diff --git a/layouts/partials/shortcodes/badge.html b/layouts/partials/shortcodes/badge.html
index d8779bdc4d..40e8c0df69 100644
--- a/layouts/partials/shortcodes/badge.html
+++ b/layouts/partials/shortcodes/badge.html
@@ -16,5 +16,5 @@
   {{- $icon = printf "fa-fw fas fa-%s" $icon }}
 {{- end }}
 {{- with $context -}}
-<span class="badge cstyle {{ $style }}{{ if or $icon $title }} badge-with-title{{ end }}">{{ if or $icon $title }}<span class="badge-title">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ if $title }}{{ $title }}{{ end }}</span>{{ end }}<span class="badge-content"{{ if $color }} style="background-color: {{ $color }};"{{ end }}>{{ $content }}</span></span>
+<span class="badge cstyle {{ $style }}{{ if or $icon $title }} badge-with-title{{ end }}">{{ if or $icon $title }}<span class="badge-title">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ if $title }}{{ $title | markdownify }}{{ end }}</span>{{ end }}<span class="badge-content"{{ if $color }} style="background-color: {{ $color }};"{{ end }}>{{ $content }}</span></span>
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/shortcodes/button.html b/layouts/partials/shortcodes/button.html
index ea4a44c5d2..210a4b313b 100644
--- a/layouts/partials/shortcodes/button.html
+++ b/layouts/partials/shortcodes/button.html
@@ -44,8 +44,8 @@
   {{- end }}
     {{- if and $icon (eq $iconposition "left") }}
     <i class="{{ $icon }}"></i>
-    {{- end }}
-    {{ $title }}
+    {{- end }} 
+    {{ $title | safeHTML }}
     {{- if and $icon (eq $iconposition "right") }}
     <i class="{{ $icon }}"></i>
     {{- end }}
diff --git a/layouts/partials/shortcodes/expand.html b/layouts/partials/shortcodes/expand.html
index d9132e3907..3998920d56 100644
--- a/layouts/partials/shortcodes/expand.html
+++ b/layouts/partials/shortcodes/expand.html
@@ -13,7 +13,7 @@
     <label class="expand-label" for="expand-{{ $id }}" >
         <i class="fas fa-chevron-down"></i>
         <i class="fas fa-chevron-right"></i>
-        {{ $title }}
+        {{ $title | markdownify }}
     </label>
     <div id="expandcontent-{{ $id }}" class="expand-content">
 {{ $content | safeHTML }}
diff --git a/layouts/partials/shortcodes/notice.html b/layouts/partials/shortcodes/notice.html
index 06b1af3f60..784eb9947e 100644
--- a/layouts/partials/shortcodes/notice.html
+++ b/layouts/partials/shortcodes/notice.html
@@ -17,7 +17,7 @@
 {{- end }}
 {{- with $context }}
 <div class="box notices cstyle {{ $style }}"{{ if $color }} style="--VARIABLE-BOX-color: {{ $color }};"{{ end }}>
-  <div class="box-label">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ $title }}</div>
+  <div class="box-label">{{ if $icon }}<i class="{{ $icon }}"></i>{{ end }}{{ if and $icon $title }} {{ end }}{{ $title | markdownify }}</div>
   <div class="box-content">
 {{ $content | safeHTML }}  </div>
 </div>