diff --git a/core/lib/Drupal/Core/Layout/Annotation/Layout.php b/core/lib/Drupal/Core/Layout/Annotation/Layout.php
index 008de2d8f3..68ff9d81b9 100644
--- a/core/lib/Drupal/Core/Layout/Annotation/Layout.php
+++ b/core/lib/Drupal/Core/Layout/Annotation/Layout.php
@@ -116,7 +116,7 @@ class Layout extends Plugin {
    *
    * @var string[][] optional
    *
-   * @see \Drupal\Core\Layout\IconGeneratorInterface::generate()
+   * @see \Drupal\Core\Layout\Icon\IconGeneratorInterface::generate()
    */
   public $icon_map;
 
diff --git a/core/lib/Drupal/Core/Layout/Icon/IconFactoryInterface.php b/core/lib/Drupal/Core/Layout/Icon/IconFactoryInterface.php
new file mode 100644
index 0000000000..63c8782ca0
--- /dev/null
+++ b/core/lib/Drupal/Core/Layout/Icon/IconFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\Core\Layout\Icon;
+
+/**
+ * Provides an interface for icon factories.
+ */
+interface IconFactoryInterface {
+
+  /**
+   * Gets the icon generator.
+   *
+   * @return \Drupal\Core\Layout\Icon\IconGeneratorInterface
+   *   Returns an Icon generator.
+   */
+  public function get();
+
+}
diff --git a/core/lib/Drupal/Core/Layout/IconGeneratorInterface.php b/core/lib/Drupal/Core/Layout/Icon/IconGeneratorInterface.php
similarity index 98%
rename from core/lib/Drupal/Core/Layout/IconGeneratorInterface.php
rename to core/lib/Drupal/Core/Layout/Icon/IconGeneratorInterface.php
index 2c8d433c3f..e513266df6 100644
--- a/core/lib/Drupal/Core/Layout/IconGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Layout/Icon/IconGeneratorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Core\Layout;
+namespace Drupal\Core\Layout\Icon;
 
 /**
  * Provides an interface for generating layout icons.
diff --git a/core/lib/Drupal/Core/Layout/IconGenerator.php b/core/lib/Drupal/Core/Layout/Icon/SvgIcon.php
similarity index 98%
rename from core/lib/Drupal/Core/Layout/IconGenerator.php
rename to core/lib/Drupal/Core/Layout/Icon/SvgIcon.php
index 14f61c664b..0acf3feecb 100644
--- a/core/lib/Drupal/Core/Layout/IconGenerator.php
+++ b/core/lib/Drupal/Core/Layout/Icon/SvgIcon.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Core\Layout;
+namespace Drupal\Core\Layout\Icon;
 
 use Drupal\Component\Utility\Html;
 
 /**
- * Generates layout icons.
+ * Generates SVG layout icons.
  */
-class IconGenerator implements IconGeneratorInterface {
+class SvgIcon implements IconGeneratorInterface {
 
   /**
    * The machine name of the layout.
diff --git a/core/lib/Drupal/Core/Layout/Icon/SvgIconFactory.php b/core/lib/Drupal/Core/Layout/Icon/SvgIconFactory.php
new file mode 100644
index 0000000000..b966095df0
--- /dev/null
+++ b/core/lib/Drupal/Core/Layout/Icon/SvgIconFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Drupal\Core\Layout\Icon;
+
+/**
+ * Creates an SVG icon generator.
+ */
+class SvgIconFactory implements IconFactoryInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function get() {
+    return new SvgIcon();
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Layout/LayoutDefinition.php b/core/lib/Drupal/Core/Layout/LayoutDefinition.php
index adf6d51149..e0306a8c4d 100644
--- a/core/lib/Drupal/Core/Layout/LayoutDefinition.php
+++ b/core/lib/Drupal/Core/Layout/LayoutDefinition.php
@@ -90,7 +90,7 @@ class LayoutDefinition extends PluginDefinition implements PluginDefinitionInter
    *
    * @var string[][]|null
    *
-   * @see \Drupal\Core\Layout\IconGeneratorInterface::generate()
+   * @see \Drupal\Core\Layout\Icon\IconGeneratorInterface::generate()
    */
   protected $icon_map;
 
@@ -449,11 +449,11 @@ public function getIcon($width = 125, $height = 150, $stroke_width = 1, $padding
   /**
    * Wraps the icon generator.
    *
-   * @return \Drupal\Core\Layout\IconGeneratorInterface
+   * @return \Drupal\Core\Layout\Icon\IconGeneratorInterface
    *   The icon generator.
    */
   protected function getIconGenerator() {
-    return \Drupal::service('layout.icon_generator');
+    return \Drupal::service('layout.icon_generator')->get();
   }
 
   /**
diff --git a/core/modules/layout_discovery/layout_discovery.services.yml b/core/modules/layout_discovery/layout_discovery.services.yml
index 6bb4073e7d..805b562b75 100644
--- a/core/modules/layout_discovery/layout_discovery.services.yml
+++ b/core/modules/layout_discovery/layout_discovery.services.yml
@@ -3,4 +3,4 @@ services:
     class: Drupal\Core\Layout\LayoutPluginManager
     arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@theme_handler']
   layout.icon_generator:
-    class: Drupal\Core\Layout\IconGenerator
+    class: Drupal\Core\Layout\Icon\SvgIconFactory
diff --git a/core/tests/Drupal/KernelTests/Core/Layout/IconGeneratorTest.php b/core/tests/Drupal/KernelTests/Core/Layout/IconGeneratorTest.php
index fa9d8a61db..a28a083fa3 100644
--- a/core/tests/Drupal/KernelTests/Core/Layout/IconGeneratorTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Layout/IconGeneratorTest.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\KernelTests\Core\Layout;
 
-use Drupal\Core\Layout\IconGenerator;
+use Drupal\Core\Layout\Icon\SvgIcon;
 use Drupal\Core\Render\RenderContext;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * @coversDefaultClass \Drupal\Core\Layout\IconGenerator
+ * @coversDefaultClass \Drupal\Core\Layout\Icon\SvgIcon
  * @group Layout
  */
 class IconGeneratorTest extends KernelTestBase {
@@ -21,7 +21,7 @@ class IconGeneratorTest extends KernelTestBase {
    *
    * @dataProvider providerTestGenerate
    */
-  public function testGenerate(IconGenerator $icon_generator, $icon_map, $expected) {
+  public function testGenerate(SvgIcon $icon_generator, $icon_map, $expected) {
     $renderer = $this->container->get('renderer');
 
     $build = $icon_generator->generate($icon_map);
@@ -34,14 +34,14 @@ public function testGenerate(IconGenerator $icon_generator, $icon_map, $expected
 
   public function providerTestGenerate() {
     $data = [];
-    $data['empty'][] = (new IconGenerator());
+    $data['empty'][] = (new SvgIcon());
     $data['empty'][] = [];
     $data['empty'][] = <<<'EOD'
 <svg width="250" height="300" class="layout-icon"></svg>
 
 EOD;
 
-    $data['two_column'][] = (new IconGenerator())
+    $data['two_column'][] = (new SvgIcon())
       ->setId('two_column')
       ->setLabel('Two Column');
     $data['two_column'][] = [['left', 'right']];
@@ -57,7 +57,7 @@ public function providerTestGenerate() {
 
 EOD;
 
-    $data['two_column_no_stroke'][] = (new IconGenerator())
+    $data['two_column_no_stroke'][] = (new SvgIcon())
       ->setStrokeWidth(NULL);
     $data['two_column_no_stroke'][] = [['left', 'right']];
     $data['two_column_no_stroke'][] = <<<'EOD'
@@ -71,7 +71,7 @@ public function providerTestGenerate() {
 
 EOD;
 
-    $data['two_column_border_collapse'][] = (new IconGenerator())
+    $data['two_column_border_collapse'][] = (new SvgIcon())
       ->setPadding(-2);
     $data['two_column_border_collapse'][] = [['left', 'right']];
     $data['two_column_border_collapse'][] = <<<'EOD'
@@ -85,7 +85,7 @@ public function providerTestGenerate() {
 
 EOD;
 
-    $data['stacked'][] = (new IconGenerator());
+    $data['stacked'][] = (new SvgIcon());
     $data['stacked'][] = [
       ['sidebar', 'top', 'top'],
       ['sidebar', 'left', 'right'],