diff --git a/assets/css/main.css b/assets/css/main.css
index 90cb1cc..29e0073 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -338,7 +338,7 @@ pre {
 /* center standalone images; same justification as
  * for centering the body contents. Also makes images easier to see
  * for people holding a device with one hand. */
-picture > img {
+div[itemprop="articleBody"] img {
 	display: block;
 	height: auto;
 	margin: auto;
diff --git a/layouts/shortcodes/indieweb-icon.html b/layouts/shortcodes/indieweb-icon.html
index 48e6fd0..2419cfc 100644
--- a/layouts/shortcodes/indieweb-icon.html
+++ b/layouts/shortcodes/indieweb-icon.html
@@ -1,9 +1,14 @@
 {{ $favicon := resources.Get "/favicon.png" -}}
 {{- $favicon_base64 := $favicon.Content | base64Encode -}}
+{{- $favicon_bigpng := resources.Get "/favicon192.png" | resources.Fingerprint "md5" -}}
 {{- $favicon_svg := resources.Get "/favicon.svg" | resources.Fingerprint "md5" -}}
+{{- if in site.BaseURL ".onion" -}}
 <img itemprop="image" class="u-photo photo" width="16" height="16" alt=""
-{{ if in site.BaseURL ".onion" -}}
-	src="data:image/png;base64,{{ $favicon_base64 }}"
+	src="data:image/png;base64,{{ $favicon_base64 }}" />
 {{- else -}}
-	src="{{ $favicon_svg.RelPermalink }}"
-{{- end }} />
+<picture itemprop="image">
+	<source srcset="{{ $favicon_svg.RelPermalink }}" type="image/svg+xml" />
+	<img class="u-photo photo" width="16" height="16" alt=""
+		src="{{ $favicon_bigpng.RelPermalink }}" />
+</picture>
+{{- end -}}
diff --git a/scripts/xhtmlize-single-file.sh b/scripts/xhtmlize-single-file.sh
index 456991b..a731873 100644
--- a/scripts/xhtmlize-single-file.sh
+++ b/scripts/xhtmlize-single-file.sh
@@ -34,7 +34,7 @@ sed 7d "$html_file" | xmllint --format --encode UTF-8 --noent - | sd '^\t' '' >"
 		| sd '<pre(?: tabindex="0")?>\n\t*<code ' '<pre tabindex="0"><code ' \
 		| sd '(?:\n)?</code>\n(?:[\t\s]*)?</pre>' '</code></pre>' \
 		| sd '</span>.span itemprop="familyName"' '</span> <span itemprop="familyName"' \
-		| sd '(<img itemprop="image" class="u-photo photo"[^>]*/>)<span' '$1 <span' \
+		| sd '</picture><span itemprop="name" class="p-name fn n">' '</picture> <span itemprop="name" class="p-name fn n">' \
 		| sd '([a-z])<(data|time)' '$1 <$2'
 } >>"$xhtml_file"