diff --git a/demo/src/stubs/hassio_supervisor.ts b/demo/src/stubs/hassio_supervisor.ts
index 95c0d330d4..6b75b020b7 100644
--- a/demo/src/stubs/hassio_supervisor.ts
+++ b/demo/src/stubs/hassio_supervisor.ts
@@ -31,7 +31,7 @@ export const mockHassioSupervisor = (hass: MockHomeAssistant) => {
             version_latest: "3.6.2",
             update_available: false,
             repository: "a0d7b954",
-            icon: true,
+            icon: false,
             logo: true,
           },
           {
diff --git a/gallery/public/api/hassio/addons/core_zwave_js/icon b/gallery/public/api/hassio/addons/core_zwave_js/icon
new file mode 100644
index 0000000000..91ac9039d9
Binary files /dev/null and b/gallery/public/api/hassio/addons/core_zwave_js/icon differ
diff --git a/src/components/ha-addon-picker.ts b/src/components/ha-addon-picker.ts
index 1dd6a11cea..7a7abf13b1 100644
--- a/src/components/ha-addon-picker.ts
+++ b/src/components/ha-addon-picker.ts
@@ -13,9 +13,12 @@ import { HaComboBox } from "./ha-combo-box";
 
 const rowRenderer: ComboBoxLitRenderer<HassioAddonInfo> = (
   item
-) => html`<mwc-list-item twoline>
+) => html`<mwc-list-item twoline graphic="icon">
   <span>${item.name}</span>
   <span slot="secondary">${item.slug}</span>
+  ${item.icon
+    ? html`<img slot="graphic" .src="/api/hassio/addons/${item.slug}/icon" />`
+    : ""}
 </mwc-list-item>`;
 
 @customElement("ha-addon-picker")