diff --git a/content/reference.md b/content/reference.md
index d8ed4c5e11..71aa4aaff0 100644
--- a/content/reference.md
+++ b/content/reference.md
@@ -80,16 +80,16 @@ various APIs, CLIs, drivers and specifications, and file formats.
 
 ## File formats
 
-{{< grid grid_files >}}
+{{< grid items="grid_files" >}}
 
 ## Command-line interfaces (CLIs)
 
-{{< grid grid_clis >}}
+{{< grid items="grid_clis" >}}
 
 ## Application programming interfaces (APIs)
 
-{{< grid grid_apis >}}
+{{< grid items="grid_apis" >}}
 
 ## Drivers and specifications
 
-{{< grid grid_specs >}}
+{{< grid items="grid_specs" >}}
diff --git a/content/security/_index.md b/content/security/_index.md
index d09b4ab214..fd7b99ee74 100644
--- a/content/security/_index.md
+++ b/content/security/_index.md
@@ -90,14 +90,14 @@ For both administrators and developers, Docker provides security-specific produc
 
 Explore the security features Docker offers to satisfy your company's security policies.
 
-{{< grid grid_admins >}} 
+{{< grid items="grid_admins" >}} 
 
 ## For developers
 
 See how you can protect your local environments, infrastructure, and networks without impeding productivity.
 
-{{< grid grid_developers >}}  
+{{< grid items="grid_developers" >}}
 
 ## Further resources
 
-{{< grid grid_resources >}}
+{{< grid items="grid_resources" >}}
diff --git a/content/trusted-content/_index.md b/content/trusted-content/_index.md
index c12e605a50..dde09d5fd1 100644
--- a/content/trusted-content/_index.md
+++ b/content/trusted-content/_index.md
@@ -5,15 +5,15 @@ keywords: doi, dvp, dsos, open source, security, base images
 grid:
 - title: Docker Official Images
   description: A curated set of Docker repositories hosted on Docker Hub.
-  image: /trusted-content/images/doi-icon.svg
+  icon: /trusted-content/images/doi-icon.svg
   link: /trusted-content/official-images/
 - title: Docker Verified Publisher
   description: High-quality images from verified vendors.
-  image: /trusted-content/images/dvp-icon.svg
+  icon: /trusted-content/images/dvp-icon.svg
   link: /trusted-content/dvp-program/
 - title: Docker-Sponsored Open Source
   description: High-quality images from non-commercial open source projects.
-  image: /trusted-content/images/dsos-icon.svg
+  icon: /trusted-content/images/dsos-icon.svg
   link: /trusted-content/dsos-program/
 ---
 
diff --git a/layouts/partials/components/card.html b/layouts/partials/components/card.html
index 2eeb210045..20ecfeea7f 100644
--- a/layouts/partials/components/card.html
+++ b/layouts/partials/components/card.html
@@ -1,31 +1,54 @@
+{{ if (and .image .icon) }}
+  {{ errorf "card: don't use both image and icon: %s" . }}
+{{ end }}
 <div class="not-prose overflow-x-hidden">
   {{ if .link }}
-    <a class="h-full" href="{{ .link }}">
-  {{ end }}
-    <div
-      class="h-full bg-white flex flex-col gap-2 rounded-sm p-4
+  <a class="h-full" href="{{ .link }}">
+    {{ end }}
+    <div class="h-full bg-white rounded-sm
              border border-gray-light-100 drop-shadow-sm dark:bg-gray-dark-200 dark:border-gray-dark-400
              {{ if .link }}hover:drop-shadow-lg hover:border-gray-light-200 hover:dark:border-gray-dark{{ end }}">
-      <div class="flex gap-4 items-center">
-        {{ if .image }}
-          <img class="w-[32px]" src="{{ .image }}" alt="">
-        {{ else if .icon }}
-          <span
-            class="material-symbols-rounded text-[32px]"
-            >{{ .icon }}</span
-          >
-        {{ end }}
-        <div>
-          <div class="text-xl text-gray-light-800 leading-snug dark:text-white flex items-center gap-2">
+      {{ if .image }}
+      {{/* use the "tall image" layout */}}
+      <div class="flex gap-2 items-stretch">
+        <div class="basis-1/3">
+          <img class="h-full w-full object-cover" src="{{ .image }}" alt="">
+        </div>
+        <div class="basis-2/3 flex flex-col gap-2 p-4">
+          <div class="text-xl text-gray-light-800 leading-snug dark:text-white flex gap-2">
             {{ markdownify .title }}
           </div>
+          <div class="text-gray-light-500 leading-snug dark:text-gray-dark-700">
+            {{ .description | markdownify }}
+          </div>
         </div>
       </div>
-      <div class="text-gray-light-500 leading-snug dark:text-gray-dark-700">
-        {{ .description | markdownify }}
+      {{ else }}
+      {{/* use the default layout */}}
+      <div class="flex flex-col gap-2 p-4">
+        <div class="flex gap-4 items-center">
+          {{ with .icon }}
+            {{ if strings.ContainsAny . "/." }}
+            {{/* image file */}}
+            <img class="w-[32px]" src="{{ . }}" alt="">
+            {{ else }}
+            {{/* icon ligature */}}
+            <span class="material-symbols-rounded text-[32px]">{{ . }}</span>
+            {{ end }}
+          {{ end }}
+          <div>
+            <div class="text-xl text-gray-light-800 leading-snug dark:text-white flex items-center gap-2">
+              {{ markdownify .title }}
+            </div>
+          </div>
+        </div>
+        <div class="text-gray-light-500 leading-snug dark:text-gray-dark-700">
+          {{ .description | markdownify }}
+        </div>
       </div>
+      {{ end }}
     </div>
-  {{ if .link }}
-    </a>
+    {{ if .link }}
+  </a>
   {{ end }}
 </div>
diff --git a/layouts/shortcodes/grid.html b/layouts/shortcodes/grid.html
index acc2f6bddc..a43e0e4f80 100644
--- a/layouts/shortcodes/grid.html
+++ b/layouts/shortcodes/grid.html
@@ -1,5 +1,6 @@
-<div class="not-prose grid grid-cols-3 xl:grid-cols-2 gap-4 sm:flex sm:flex-col">
-  {{ $items := index .Page.Params (.Get 0 | default "grid") }}
+{{ $cols := .Get "cols" | default 3 }}
+<div class="not-prose grid grid-cols-{{ $cols }} xl:grid-cols-{{ sub $cols 1 }} gap-4 sm:flex sm:flex-col">
+  {{ $items := index .Page.Params (.Get "items" | default "grid") }}
   {{ range $items }}
     {{ $opts := dict "title" .title "link" .link "description" .description "icon" .icon "image" .image }}
     {{ partial "components/card.html" $opts }}