diff --git a/exampleSite/content/test-product/tab-group/tab-group.md b/exampleSite/content/test-product/tab-group/tab-group.md
index 190e293..321c6c1 100644
--- a/exampleSite/content/test-product/tab-group/tab-group.md
+++ b/exampleSite/content/test-product/tab-group/tab-group.md
@@ -8,6 +8,22 @@ weight: 200
 
 {{<tabs name="common_steps_for_nginx_oss_and_plus">}}
 
+{{%tab name="Call Outs"%}}
+
+{{<call-out "caution call-out" "Deprecated documentation notice" "fa fa-exclamation-triangle" >}}
+This is a callout with an icon.
+{{</call-out>}}
+
+{{<caution>}}
+This is a Caution callout. There was previously a bug with **bold text** that we should be aware of and continue to check for. This callout was invoked with the `<caution>` shortcode. It has no custom title.
+{{</caution>}}
+
+{{<call-out "" "Custom title">}}
+This is a plain callout with a title. It has a [link](#plain-callouts) to a heading on this page. Its shortcode is `<call-out>` with a custom title parameter.
+{{</call-out>}}
+
+{{%/tab%}}
+
 {{%tab name="Ordered List With Code Block types"%}}
 
 1. Create the `/etc/ssl/nginx` directory:
@@ -40,6 +56,8 @@ nginx -s reload
 ```
 
 {{%/tab%}}
+
+
 {{</tabs>}}
 
 
diff --git a/layouts/partials/callout.html b/layouts/partials/callout.html
index 9cb4796..616bfe0 100644
--- a/layouts/partials/callout.html
+++ b/layouts/partials/callout.html
@@ -24,9 +24,9 @@
 {{/*  Old frame callout  */}}
 <blockquote class="{{ $class }}" data-mf="false">
   <div>
-    {{ with $icon }}
+    {{- with $icon -}}
       <i class="{{ . }}"></i>
-    {{ end }}
+    {{- end -}}
     <strong>{{ $title }}</strong>
     {{ .content | markdownify }}
   </div>
@@ -59,7 +59,7 @@
     </div>
   </blockquote>
 </div>
-  
+
 {{ else }}
 
 {{/*  "Generic" mf callout  */}}
@@ -68,13 +68,13 @@
 
 <blockquote class="{{ $class }} note" data-mf="true" style="display: none;" data-title="{{ $cleanTitle }}">
   <div class="callout-content">
-    {{ with $icon }}
+    {{- with $icon -}}
       <i class="{{ . }}"></i>
-    {{ end }}
+    {{- end -}}
     <div class="callout-content">
     {{ .content | markdownify }}
     </div>
   </div>
 </blockquote>
 
-{{ end }}
\ No newline at end of file
+{{ end }}