diff --git a/assets/sass/_zen.scss b/assets/sass/_zen.scss
index 8f2d672..bd87493 100644
--- a/assets/sass/_zen.scss
+++ b/assets/sass/_zen.scss
@@ -175,7 +175,6 @@ figure {
         caption-side: bottom;
       }
 
-      h4,
       p {
         margin: 0;
       }
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 9c2be30..518f81b 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -87,11 +87,11 @@
 
 <figure class="image{{ with $class }} {{ . }}{{ end }}">
 {{ with $link }}<a href="{{ . }}">{{ end -}}
-<img src="{{ $src }}"{{ with $srcsetw }} srcset="{{ delimit  .  ", " }}"{{ end }}{{ with $alt }} alt="{{ . }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
+<img src="{{ $src }}"{{ with $srcsetw }} srcset="{{ delimit  .  ", " }}"{{ end }}{{ if isset .Params "alt" }} alt="{{ $alt }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
 {{- if $link }}</a>{{ end }}
 {{ if or $title $caption $attr -}}
 <figcaption>
-{{ with $title }}<h4>{{ . }}</h4>{{ end -}}
+{{ with $title }}<strong>{{ . }}</strong><br>{{ end -}}
 {{- $caption | markdownify }}{{ if and $caption $attr }} {{ end -}}
 {{ with $attrlink }}<a href="{{ . }}">{{ end }}{{ $attr | markdownify }}{{ if $attrlink }}</a>{{ end -}}
 </figcaption>
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index c972159..2cb3fc9 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -82,5 +82,5 @@
 {{ end -}}
 
 {{ with $link }}<a class="image-link" href="{{ . }}">{{ end -}}
-<img class="image{{ with $class }} {{ . }}{{ end }}" src="{{ $src }}"{{ with $srcsetw }} srcset="{{ delimit  .  ", " }}"{{ end }}{{ with $alt }} alt="{{ . }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
+<img class="image{{ with $class }} {{ . }}{{ end }}" src="{{ $src }}"{{ with $srcsetw }} srcset="{{ delimit  .  ", " }}"{{ end }}{{ if isset .Params "alt" }} alt="{{ $alt }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
 {{- if $link }}</a>{{ end }}
diff --git a/layouts/shortcodes/svg.html b/layouts/shortcodes/svg.html
index c2e7f96..5c31cce 100644
--- a/layouts/shortcodes/svg.html
+++ b/layouts/shortcodes/svg.html
@@ -54,7 +54,7 @@
 {{ if $inline -}}
 <div class="image image--svg{{ with $class }} {{ . }}{{ end }}">{{ $src | safeHTML }}</div>
 {{ else -}}
-<img class="image image--svg{{ with $class }} {{ . }}{{ end }}" src="{{ $src }}"{{ with $alt }} alt="{{ . }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
+<img class="image image--svg{{ with $class }} {{ . }}{{ end }}" src="{{ $src }}"{{ if isset .Params "alt" }} alt="{{ $alt }}"{{ end }}{{ with $width }} width="{{ . }}"{{ end }}{{ with $height }} height="{{ . }}"{{ end }}>
 {{ end -}}
 {{- if $link }}</a>{{ end }}
 {{ if $caption -}}