diff --git a/demo/client.ts b/demo/client.ts
index 25e022d5..81f4e821 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -13,7 +13,7 @@ import { Terminal } from '../out/browser/public/Terminal';
 import { AttachAddon } from '../addons/xterm-addon-attach/out/AttachAddon';
 import { CanvasAddon } from '../addons/xterm-addon-canvas/out/CanvasAddon';
 import { FitAddon } from '../addons/xterm-addon-fit/out/FitAddon';
-import { ImageAddon } from '../addons/xterm-addon-image/out/ImageAddon';
+import { ImageAddon, IImageAddonOptions } from '../addons/xterm-addon-image/out/ImageAddon';
 import { SearchAddon, ISearchOptions } from '../addons/xterm-addon-search/out/SearchAddon';
 import { SerializeAddon } from '../addons/xterm-addon-serialize/out/SerializeAddon';
 import { WebLinksAddon } from '../addons/xterm-addon-web-links/out/WebLinksAddon';
@@ -237,6 +237,7 @@ if (document.location.pathname === '/test') {
   document.getElementById('add-overview-ruler').addEventListener('click', addOverviewRuler);
   document.getElementById('weblinks-test').addEventListener('click', testWeblinks);
   addVtButtons();
+  initImageAddonExposed();
 }
 
 function createTerminal(): void {
@@ -583,6 +584,19 @@ function initAddons(term: TerminalType): void {
       addon.instance.onDidChangeResults(e => updateFindResults(e));
     }
     addDomListener(checkbox, 'change', () => {
+      if (name === 'image') {
+        if (checkbox.checked) {
+          const ctorOptionsJson = document.querySelector<HTMLTextAreaElement>('#image-options').value;
+          addon.instance = ctorOptionsJson
+            ? new addon.ctor(JSON.parse(ctorOptionsJson))
+            : new addon.ctor();
+          term.loadAddon(addon.instance);
+        } else {
+          addon.instance!.dispose();
+          addon.instance = undefined;
+        }
+        return;
+      }
       if (checkbox.checked) {
         addon.instance = new addon.ctor();
         try {
@@ -1199,3 +1213,78 @@ stop at final '?': Maybe this one http://example.com/with?arguments=false?
   `;
   term.write(linkExamples.split('\n').join('\r\n'));
 }
+
+
+function initImageAddonExposed(): void {
+  const DEFAULT_OPTIONS: IImageAddonOptions = (addons.image.instance as any)._defaultOpts;
+  const limitStorageElement = document.querySelector<HTMLInputElement>('#image-storagelimit');
+  limitStorageElement.valueAsNumber = addons.image.instance.storageLimit;
+  addDomListener(limitStorageElement, 'change', () => {
+    try {
+      addons.image.instance.storageLimit = limitStorageElement.valueAsNumber;
+      limitStorageElement.valueAsNumber = addons.image.instance.storageLimit;
+      console.log('changed storageLimit to', addons.image.instance.storageLimit);
+    } catch (e) {
+      limitStorageElement.valueAsNumber = addons.image.instance.storageLimit;
+      console.log('storageLimit at', addons.image.instance.storageLimit);
+      throw e;
+    }
+  });
+  const showPlaceholderElement = document.querySelector<HTMLInputElement>('#image-showplaceholder');
+  showPlaceholderElement.checked = addons.image.instance.showPlaceholder;
+  addDomListener(showPlaceholderElement, 'change', () => {
+    addons.image.instance.showPlaceholder = showPlaceholderElement.checked;
+  });
+  const ctorOptionsElement = document.querySelector<HTMLTextAreaElement>('#image-options');
+  ctorOptionsElement.value = JSON.stringify(DEFAULT_OPTIONS, null, 2);
+
+  const sixel_demo = (url: string) => () => fetch(url)
+    .then(resp => resp.arrayBuffer())
+    .then(buffer => {
+      term.write('\r\n');
+      term.write(new Uint8Array(buffer));
+    });
+  
+  const iip_demo = (url: string) => () => fetch(url)
+  .then(resp => resp.arrayBuffer())
+  .then(buffer => {
+    const data = new Uint8Array(buffer);
+    let sdata = '';
+    for (let i = 0; i < data.length; ++i) sdata += String.fromCharCode(data[i]);
+    term.write('\r\n');
+    term.write(`\x1b]1337;File=inline=1;size=${data.length}:${btoa(sdata)}\x1b\\`);
+  });
+
+  document.getElementById('image-demo1').addEventListener('click',
+    sixel_demo('https://raw.githubusercontent.com/saitoha/libsixel/master/images/snake.six'));
+  document.getElementById('image-demo2').addEventListener('click',
+    sixel_demo('https://raw.githubusercontent.com/jerch/node-sixel/master/testfiles/test2.sixel'));
+  document.getElementById('image-demo3').addEventListener('click',
+    iip_demo('https://raw.githubusercontent.com/jerch/node-sixel/master/palette.png'));
+
+  // demo for image retrieval API
+  term.element.addEventListener('click', (ev: MouseEvent) => {
+    if (!ev.ctrlKey || !addons.image.instance) return;
+
+    // TODO...
+    // if (ev.altKey) {
+    //   const sel = term.getSelectionPosition();
+    //   if (sel) {
+    //     addons.image.instance
+    //       .extractCanvasAtBufferRange(term.getSelectionPosition())
+    //       ?.toBlob(data => window.open(URL.createObjectURL(data), '_blank'));
+    //     return;
+    //   }
+    // }
+
+    const pos = term._core._mouseService!.getCoords(ev, term._core.screenElement!, term.cols, term.rows);
+    const x = pos[0] - 1;
+    const y = pos[1] - 1;
+    const canvas = ev.shiftKey
+      // ctrl+shift+click: get single tile
+      ? addons.image.instance.extractTileAtBufferCell(x, term.buffer.active.viewportY + y)
+      // ctrl+click: get original image
+      : addons.image.instance.getImageAtBufferCell(x, term.buffer.active.viewportY + y);
+    canvas?.toBlob(data => window.open(URL.createObjectURL(data), '_blank'));
+  });
+}
diff --git a/demo/index.html b/demo/index.html
index 42f8462e..458a12c8 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -55,6 +55,19 @@
             <span id="htmlserialize-output-result"></span>
             <div><pre id="htmlserialize-output"></pre></div>
           </div>
+          <h4>Image Addon</h4>
+          <details>
+            <summary>image addon settings</summary>
+            <div>
+              <label>Storage Limit (in MB) <input type="number" id="image-storagelimit"/></label><br/>
+              <label>Show Placeholder <input type="checkbox" id="image-showplaceholder"/></label>
+              <br/><br/>
+              <label>
+                Ctor options (applied on addon relaunch)<br/>
+                <textarea id="image-options" cols="40" rows="12"></textarea>
+              </label>
+            </div>
+          </details>
         </div>
         <div id="style" class="tabContent">
           <h3>Style</h3>
@@ -90,6 +103,11 @@
 
               <dt>Weblinks Addon</dt>
               <dd><button id="weblinks-test" title="Various url conditions from demo data, hover&click to test">Test URLs</button></dd>
+            
+              <dt>Image Test</dt>
+              <dd><button id="image-demo1">snake (sixel)</button></dd>
+              <dd><button id="image-demo2">oranges (sixel)</button></dd>
+              <dd><button id="image-demo3">palette (iip)</button></dd>
             </dl>
           </div>
         </div>