diff --git a/layouts/partials/header-image.html b/layouts/partials/header-image.html
deleted file mode 100644
index e7110fb..0000000
--- a/layouts/partials/header-image.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<img class="shadow featured"
-	{{ with .image }}
-		srcset="
-		{{ (.Resize "320x q30").RelPermalink }} 500w,
-		{{ (.Resize "600x q40").RelPermalink }} 800w,
-		{{ (.Resize "1200x q65").RelPermalink }} 2x"
-    src="{{ (.Resize "320x q30").RelPermalink }}"
-	{{ end }}
-    alt="{{ .alt }}"
-/>
diff --git a/layouts/partials/image.html b/layouts/partials/image.html
new file mode 100644
index 0000000..1db1aa1
--- /dev/null
+++ b/layouts/partials/image.html
@@ -0,0 +1,21 @@
+<img class="{{ .class }}"
+	{{ with .image }}
+		srcset="
+    		{{- with (.Resize "600x q40") -}}
+        		{{ printf "%s %dw," .RelPermalink .Width }}
+    		{{- end -}}
+
+    		{{- with (.Resize "1200x q65") -}}
+        		{{ printf "%s %dw" .RelPermalink .Width }}
+    		{{- end -}}"
+
+    	sizes="
+    		{{- with (.Resize "600x q40") -}}
+    			{{- printf "(max-width: 700px) %dpx," .Width -}}
+    		{{- end -}}
+    		800px"
+
+        src="{{ (.Resize "1200x q65").RelPermalink }}"
+	{{ end }}
+    alt="{{ .alt }}"
+>
diff --git a/layouts/partials/responsive-image.html b/layouts/partials/responsive-image.html
deleted file mode 100644
index 9beba51..0000000
--- a/layouts/partials/responsive-image.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<img class="{{ .class | default "fill-wh"}}"
-	{{ with .context.Resources.GetMatch .context.Params.featured.url }}
-		srcset="
-		{{ (.Resize "320x q30").RelPermalink }} 500w,
-		{{ (.Resize "600x q40").RelPermalink }} 800w,
-		{{ (.Resize "1200x q65").RelPermalink }} 2x"
-    src="{{ (.Resize "320x q30").RelPermalink }}"
-    alt="{{ .Params.alt }}"
-	{{ end }}
-/>
diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
new file mode 100644
index 0000000..8bb157d
--- /dev/null
+++ b/layouts/shortcodes/image.html
@@ -0,0 +1,3 @@
+{{ $image := .Page.Resources.GetMatch (.Get "src") }}
+{{ partial "image.html" (dict "image" $image "alt" (.Get "alt") "class" "fill-wh") }}
+
diff --git a/layouts/shortcodes/responsive-image.html b/layouts/shortcodes/responsive-image.html
deleted file mode 100644
index 5059a6f..0000000
--- a/layouts/shortcodes/responsive-image.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<img class="{{ .Get "class" | default "fill-wh" }}"
-	{{ with .Get "src" | .Page.Resources.GetMatch }}
-		srcset="
-		{{ (.Resize "320x q30").RelPermalink }} 500w,
-		{{ (.Resize "600x q40").RelPermalink }} 800w,
-		{{ (.Resize "1200x q65").RelPermalink }} 2x"
-	src="{{ (.Resize "320x q30").RelPermalink }}"
-	{{ end }}
-	alt="{{ .Get "alt" }}"
-/>
-