diff --git a/extensions/blocks/slideshow/edit.js b/extensions/blocks/slideshow/edit.js
index 4a10ff2b662f7..9c03f029129fa 100644
--- a/extensions/blocks/slideshow/edit.js
+++ b/extensions/blocks/slideshow/edit.js
@@ -9,6 +9,7 @@ import { isBlobURL } from '@wordpress/blob';
 import { withDispatch } from '@wordpress/data';
 import {
 	BlockControls,
+	BlockIcon,
 	InspectorControls,
 	MediaPlaceholder,
 	MediaUpload,
@@ -29,6 +30,7 @@ import {
 /**
  * Internal dependencies
  */
+import { icon } from '.';
 import Slideshow from './slideshow';
 import './editor.scss';
 
@@ -184,7 +186,7 @@ class SlideshowEdit extends Component {
 				<Fragment>
 					{ controls }
 					<MediaPlaceholder
-						icon="format-gallery"
+						icon={ <BlockIcon icon={ icon } /> }
 						className={ className }
 						labels={ {
 							title: __( 'Slideshow', 'jetpack' ),
diff --git a/extensions/blocks/slideshow/index.js b/extensions/blocks/slideshow/index.js
index bc4cf0082b37a..9f4b2807c7c11 100644
--- a/extensions/blocks/slideshow/index.js
+++ b/extensions/blocks/slideshow/index.js
@@ -11,7 +11,7 @@ import edit from './edit';
 import save from './save';
 import transforms from './transforms';
 
-const icon = (
+export const icon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
 		<Path d="M0 0h24v24H0z" fill="none" />
 		<Path d="M10 8v8l5-4-5-4zm9-5H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14z" />
diff --git a/extensions/blocks/tiled-gallery/edit.js b/extensions/blocks/tiled-gallery/edit.js
index d9cb94641297f..455742527ccf0 100644
--- a/extensions/blocks/tiled-gallery/edit.js
+++ b/extensions/blocks/tiled-gallery/edit.js
@@ -6,6 +6,7 @@ import { Component, Fragment } from '@wordpress/element';
 import { filter, get, pick } from 'lodash';
 import {
 	BlockControls,
+	BlockIcon,
 	InspectorControls,
 	MediaPlaceholder,
 	MediaUpload,
@@ -207,7 +208,7 @@ class TiledGalleryEdit extends Component {
 				<Fragment>
 					{ controls }
 					<MediaPlaceholder
-						icon={ <div className="tiled-gallery__media-placeholder-icon">{ icon }</div> }
+						icon={ <BlockIcon icon={ icon } /> }
 						className={ className }
 						labels={ {
 							title: __( 'Tiled Gallery', 'jetpack' ),
diff --git a/extensions/blocks/tiled-gallery/editor.scss b/extensions/blocks/tiled-gallery/editor.scss
index b0741945cbaf7..4ba821c25e4d1 100644
--- a/extensions/blocks/tiled-gallery/editor.scss
+++ b/extensions/blocks/tiled-gallery/editor.scss
@@ -104,21 +104,12 @@
 		transform: translate( -50%, -50% );
 	}
 
-	// Hide captions and upload buttons in style picker preview
+	// Hide upload buttons in style picker preview
 	.editor-block-preview__content & {
-		/* @TODO Caption has been commented out */
-		// figcaption,
 		.editor-media-placeholder {
 			display: none;
 		}
 	}
-
-	// Matches with `.dashicon` in `MediaPlaceholder` component
-	.tiled-gallery__media-placeholder-icon {
-		height: 20px;
-		margin-right: 1ch; // stylelint-disable-line unit-whitelist
-		width: 20px;
-	}
 }
 
 .tiled-gallery__filter-picker-menu {