diff --git a/ts/components/Lightbox.md b/ts/components/Lightbox.md
index 079dc642c..0840244f1 100644
--- a/ts/components/Lightbox.md
+++ b/ts/components/Lightbox.md
@@ -1,3 +1,5 @@
+## Image (supported format)
+
 ```js
 const noop = () => {};
 
@@ -9,3 +11,51 @@ const noop = () => {};
   />
 </div>;
 ```
+
+## Image (unsupported format)
+
+```js
+const noop = () => {};
+
+<div style={{ position: 'relative', width: '100%', height: 500 }}>
+  <Lightbox objectURL="foo.tif" contentType="image/tiff" onSave={noop} />
+</div>;
+```
+
+## Video (supported format)
+
+```js
+const noop = () => {};
+
+<div style={{ position: 'relative', width: '100%', height: 500 }}>
+  <Lightbox
+    objectURL="fixtures/pixabay-Soap-Bubble-7141.mp4"
+    contentType="video/mp4"
+    onSave={noop}
+  />
+</div>;
+```
+
+## Video (unsupported format)
+
+```js
+const noop = () => {};
+
+<div style={{ position: 'relative', width: '100%', height: 500 }}>
+  <Lightbox objectURL="foo.mov" contentType="video/quicktime" onSave={noop} />
+</div>;
+```
+
+## Unsupported file format
+
+```js
+const noop = () => {};
+
+<div style={{ position: 'relative', width: '100%', height: 600 }}>
+  <Lightbox
+    objectURL="tsconfig.json"
+    contentType="application/json"
+    onSave={noop}
+  />
+</div>;
+```
diff --git a/ts/components/Lightbox.tsx b/ts/components/Lightbox.tsx
index af9191488..23ca8a6b8 100644
--- a/ts/components/Lightbox.tsx
+++ b/ts/components/Lightbox.tsx
@@ -3,8 +3,10 @@ import React from 'react';
 import classNames from 'classnames';
 import is from '@sindresorhus/is';
 
+import * as Colors from './styles/Colors';
 import * as GoogleChrome from '../util/GoogleChrome';
 import * as MIME from '../types/MIME';
+import { colorSVG } from '../styles/colorSVG';
 
 interface Props {
   close: () => void;
@@ -50,6 +52,13 @@ const styles = {
     maxHeight: '100%',
     objectFit: 'contain',
   } as React.CSSProperties,
+  video: {
+    flexGrow: 1,
+    flexShrink: 0,
+    maxWidth: '100%',
+    maxHeight: '100%',
+    objectFit: 'contain',
+  } as React.CSSProperties,
   controlsOffsetPlaceholder: {
     width: CONTROLS_WIDTH,
     marginRight: CONTROLS_SPACING,
@@ -110,6 +119,25 @@ const IconButtonPlaceholder = () => (
   <div style={styles.iconButtonPlaceholder} />
 );
 
+const Icon = ({
+  onClick,
+  url,
+}: {
+  onClick?: (
+    event: React.MouseEvent<HTMLImageElement | HTMLDivElement>
+  ) => void;
+  url: string;
+}) => (
+  <div
+    style={{
+      ...styles.image,
+      ...colorSVG(url, Colors.ICON_SECONDARY),
+      maxWidth: 200,
+    }}
+    onClick={onClick}
+  />
+);
+
 export class Lightbox extends React.Component<Props, {}> {
   private containerRef: HTMLDivElement | null = null;
 
@@ -172,8 +200,8 @@ export class Lightbox extends React.Component<Props, {}> {
     objectURL: string;
     contentType: MIME.MIMEType;
   }) => {
-    const isImage = GoogleChrome.isImageTypeSupported(contentType);
-    if (isImage) {
+    const isImageTypeSupported = GoogleChrome.isImageTypeSupported(contentType);
+    if (isImageTypeSupported) {
       return (
         <img
           style={styles.image}
@@ -183,18 +211,31 @@ export class Lightbox extends React.Component<Props, {}> {
       );
     }
 
-    const isVideo = GoogleChrome.isVideoTypeSupported(contentType);
-    if (isVideo) {
+    const isVideoTypeSupported = GoogleChrome.isVideoTypeSupported(contentType);
+    if (isVideoTypeSupported) {
       return (
-        <video controls={true}>
+        <video controls={true} style={styles.video}>
           <source src={objectURL} />
         </video>
       );
     }
 
+    const isUnsupportedImageType =
+      !isImageTypeSupported && MIME.isImage(contentType);
+    const isUnsupportedVideoType =
+      !isVideoTypeSupported && MIME.isVideo(contentType);
+    if (isUnsupportedImageType || isUnsupportedVideoType) {
+      return (
+        <Icon
+          url={isUnsupportedVideoType ? 'images/video.svg' : 'images/image.svg'}
+          onClick={this.onObjectClick}
+        />
+      );
+    }
+
     // tslint:disable-next-line no-console
     console.log('Lightbox: Unexpected content type', { contentType });
-    return null;
+    return <Icon onClick={this.onObjectClick} url="images/file.svg" />;
   };
 
   private setContainerRef = (value: HTMLDivElement) => {
@@ -242,7 +283,9 @@ export class Lightbox extends React.Component<Props, {}> {
     this.onClose();
   };
 
-  private onObjectClick = (event: React.MouseEvent<HTMLImageElement>) => {
+  private onObjectClick = (
+    event: React.MouseEvent<HTMLImageElement | HTMLDivElement>
+  ) => {
     event.stopPropagation();
     this.onClose();
   };
diff --git a/ts/components/styles/Colors.ts b/ts/components/styles/Colors.ts
index bcc7f814f..1730f9e81 100644
--- a/ts/components/styles/Colors.ts
+++ b/ts/components/styles/Colors.ts
@@ -2,3 +2,4 @@
  * @prettier
  */
 export const TEXT_SECONDARY = '#bbb';
+export const ICON_SECONDARY = '#ccc';