diff --git a/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php b/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
index ad052c5c41..1001022705 100644
--- a/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
+++ b/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
@@ -43,7 +43,9 @@ public function setUp() {
   public function testRegressionMissingElementsCss() {
     $this->drupalGet('');
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains('claro/css/src/base/elements.css');
+    // Testing that the global library is attached.
+    // The 'elements.css' file is the first asset of the global library.
+    $this->assertSession()->responseContains('claro/css/base/elements.css');
 
     $this->drupalLogin($this->rootUser);
     $this->drupalGet('admin/modules');
diff --git a/core/themes/claro/claro.info.yml b/core/themes/claro/claro.info.yml
index 55f43b606c..71412c9573 100644
--- a/core/themes/claro/claro.info.yml
+++ b/core/themes/claro/claro.info.yml
@@ -25,12 +25,12 @@ libraries-override:
   system/base:
     css:
       component:
-        /core/themes/stable/css/system/components/ajax-progress.module.css: css/src/components/ajax-progress.module.css
-        /core/themes/stable/css/system/components/autocomplete-loading.module.css: css/src/components/autocomplete-loading.module.css
-        /core/themes/stable/css/system/components/system-status-counter.css: css/src/components/system-status-counter.css
-        /core/themes/stable/css/system/components/system-status-report-counters.css: css/src/components/system-status-report-counters.css
-        /core/themes/stable/css/system/components/system-status-report-general-info.css: css/src/components/system-status-report-general-info.css
-        /core/themes/stable/css/system/components/tabledrag.module.css: css/src/components/tabledrag.css
+        /core/themes/stable/css/system/components/ajax-progress.module.css: css/components/ajax-progress.module.css
+        /core/themes/stable/css/system/components/autocomplete-loading.module.css: css/components/autocomplete-loading.module.css
+        /core/themes/stable/css/system/components/system-status-counter.css: css/components/system-status-counter.css
+        /core/themes/stable/css/system/components/system-status-report-counters.css: css/components/system-status-report-counters.css
+        /core/themes/stable/css/system/components/system-status-report-general-info.css: css/components/system-status-report-general-info.css
+        /core/themes/stable/css/system/components/tabledrag.module.css: css/components/tabledrag.css
 
   system/admin:
     css:
@@ -40,7 +40,7 @@ libraries-override:
   core/drupal.dropbutton:
     css:
       component:
-        /core/themes/stable/css/core/dropbutton/dropbutton.css: css/src/components/dropbutton.css
+        /core/themes/stable/css/core/dropbutton/dropbutton.css: css/components/dropbutton.css
 
   core/drupal.tabledrag:
     js:
@@ -76,7 +76,7 @@ libraries-override:
         css/components/form.css: false
         css/components/tabs.css: false
         css/components/pager.css: false
-        css/components/tableselect.css: css/src/components/tableselect.css
+        css/components/tableselect.css: css/components/tableselect.css
         css/components/tabledrag.css: false
         css/components/collapse-processed.css: false
 
@@ -93,7 +93,7 @@ libraries-override:
   classy/progress:
     css:
       component:
-        css/components/progress.css: css/src/components/progress.css
+        css/components/progress.css: css/components/progress.css
   # @todo Refactor when https://www.drupal.org/node/2642122 is fixed.
 
   classy/user: false
@@ -103,22 +103,22 @@ libraries-override:
   field_ui/drupal.field_ui:
     css:
       theme:
-        /core/themes/stable/css/field_ui/field_ui.admin.css: css/src/theme/field-ui.admin.css
+        /core/themes/stable/css/field_ui/field_ui.admin.css: css/theme/field-ui.admin.css
 
   filter/drupal.filter.admin:
     css:
       theme:
-        /core/themes/stable/css/filter/filter.admin.css: css/src/theme/filter.theme.css
+        /core/themes/stable/css/filter/filter.admin.css: css/theme/filter.theme.css
 
   filter/drupal.filter:
     css:
       theme:
-        /core/themes/stable/css/filter/filter.admin.css: css/src/theme/filter.theme.css
+        /core/themes/stable/css/filter/filter.admin.css: css/theme/filter.theme.css
 
   views_ui/admin.styling:
     css:
       theme:
-        /core/themes/stable/css/views_ui/views_ui.admin.theme.css: css/src/theme/views_ui.admin.theme.css
+        /core/themes/stable/css/views_ui/views_ui.admin.theme.css: css/theme/views_ui.admin.theme.css
 
 libraries-extend:
   ckeditor/drupal.ckeditor:
@@ -155,11 +155,11 @@ libraries-extend:
     - claro/views
 
 quickedit_stylesheets:
-  - css/src/components/quickedit.css
+  - css/components/quickedit.css
 ckeditor_stylesheets:
-  - css/src/base/elements.css
-  - css/src/base/typography.css
-  - css/src/theme/ckeditor-frame.css
+  - css/base/elements.css
+  - css/base/typography.css
+  - css/theme/ckeditor-frame.css
 
 regions:
   header: 'Header'
diff --git a/core/themes/claro/claro.libraries.yml b/core/themes/claro/claro.libraries.yml
index 1ab96c8ca8..c6c2466a47 100644
--- a/core/themes/claro/claro.libraries.yml
+++ b/core/themes/claro/claro.libraries.yml
@@ -2,53 +2,53 @@ global-styling:
   version: VERSION
   css:
     base:
-      css/src/base/elements.css: {}
-      css/src/base/typography.css: {}
-      css/src/base/print.css: {}
+      css/base/elements.css: {}
+      css/base/typography.css: {}
+      css/base/print.css: {}
     component:
-      css/src/components/accordion.css: {}
-      css/src/components/action-link.css: {}
-      css/src/components/content-header.css: {}
-      css/src/components/container-inline.css: {}
-      css/src/components/container-inline.module.css: {}
-      css/src/components/breadcrumb.css: {}
-      css/src/components/button.css: {}
-      css/src/components/details.css: {}
-      css/src/components/divider.css: {}
-      css/src/components/messages.css: {}
-      css/src/components/entity-meta.css: {}
-      css/src/components/fieldset.css: {}
-      css/src/components/form.css: {}
-      css/src/components/form--checkbox-radio.css: {}
-      css/src/components/form--checkbox-radio--ie.css: {}
-      css/src/components/form--field-multiple.css: {}
-      css/src/components/form--managed-file.css: {}
-      css/src/components/form--text.css: {}
-      css/src/components/form--select.css: {}
-      css/src/components/help.css: {}
-      css/src/components/image-preview.css: {}
-      css/src/components/menus-and-lists.css: {}
-      css/src/components/modules-page.css: {}
-      css/src/components/node.css: {}
-      css/src/components/page-title.css: {}
-      css/src/components/pager.css: {}
-      css/src/components/skip-link.css: {}
-      css/src/components/tables.css: {}
-      css/src/components/table--file-multiple-widget.css: {}
-      css/src/components/search-admin-settings.css: {}
-      css/src/components/tablesort-indicator.css: {}
-      css/src/components/system-status-report-general-info.css: {}
-      css/src/components/system-status-report.css: {}
-      css/src/components/system-status-report-counters.css: {}
-      css/src/components/system-status-counter.css: {}
-      css/src/components/tabs.css: {}
-      css/src/components/views-ui.css: {}
+      css/components/accordion.css: {}
+      css/components/action-link.css: {}
+      css/components/content-header.css: {}
+      css/components/container-inline.css: {}
+      css/components/container-inline.module.css: {}
+      css/components/breadcrumb.css: {}
+      css/components/button.css: {}
+      css/components/details.css: {}
+      css/components/divider.css: {}
+      css/components/messages.css: {}
+      css/components/entity-meta.css: {}
+      css/components/fieldset.css: {}
+      css/components/form.css: {}
+      css/components/form--checkbox-radio.css: {}
+      css/components/form--checkbox-radio--ie.css: {}
+      css/components/form--field-multiple.css: {}
+      css/components/form--managed-file.css: {}
+      css/components/form--text.css: {}
+      css/components/form--select.css: {}
+      css/components/help.css: {}
+      css/components/image-preview.css: {}
+      css/components/menus-and-lists.css: {}
+      css/components/modules-page.css: {}
+      css/components/node.css: {}
+      css/components/page-title.css: {}
+      css/components/pager.css: {}
+      css/components/skip-link.css: {}
+      css/components/tables.css: {}
+      css/components/table--file-multiple-widget.css: {}
+      css/components/search-admin-settings.css: {}
+      css/components/tablesort-indicator.css: {}
+      css/components/system-status-report-general-info.css: {}
+      css/components/system-status-report.css: {}
+      css/components/system-status-report-counters.css: {}
+      css/components/system-status-counter.css: {}
+      css/components/tabs.css: {}
+      css/components/views-ui.css: {}
     theme:
-      css/src/theme/colors.css: {}
+      css/theme/colors.css: {}
     layout:
-      css/src/layout/breadcrumb.css: {}
-      css/src/layout/local-actions.css: {}
-      css/src/layout/layout.css: {}
+      css/layout/breadcrumb.css: {}
+      css/layout/local-actions.css: {}
+      css/layout/layout.css: {}
   dependencies:
     - system/admin
     - core/jquery
@@ -68,7 +68,7 @@ node-form:
   version: VERSION
   css:
     layout:
-      css/src/layout/node-add.css: {}
+      css/layout/node-add.css: {}
   dependencies:
     - node/form
 
@@ -78,7 +78,7 @@ maintenance-page:
     js/mobile.install.js: {}
   css:
     theme:
-      css/src/theme/maintenance-page.css: {}
+      css/theme/maintenance-page.css: {}
   dependencies:
     - system/maintenance
     - claro/global-styling
@@ -89,7 +89,7 @@ install-page:
     js/mobile.install.js: {}
   css:
     theme:
-      css/src/theme/install-page.css: {}
+      css/theme/install-page.css: {}
   dependencies:
     - claro/maintenance-page
 
@@ -120,37 +120,37 @@ claro.jquery.ui:
   version: VERSION
   css:
     component:
-      css/src/components/jquery.ui/theme.css: { weight: -1 }
+      css/components/jquery.ui/theme.css: { weight: -1 }
 
 claro.drupal.dialog:
   version: VERSION
   css:
     theme:
-      css/src/components/dialog.css: {}
+      css/components/dialog.css: {}
 
 ckeditor-dialog:
   version: VERSION
   css:
     theme:
-      css/src/theme/ckeditor-dialog.css: {}
+      css/theme/ckeditor-dialog.css: {}
 
 ckeditor-editor:
   version: VERSION
   css:
     theme:
-      css/src/theme/ckeditor-editor.css: {}
+      css/theme/ckeditor-editor.css: {}
 
 tour-styling:
   version: VERSION
   css:
     theme:
-      css/src/components/tour.theme.css: {}
+      css/components/tour.theme.css: {}
 
 media-form:
   version: VERSION
   css:
     layout:
-      css/src/components/media.css: {}
+      css/components/media.css: {}
   dependencies:
     - media/form
 
@@ -158,19 +158,19 @@ image-widget:
   version: VERSION
   css:
     component:
-      css/src/layout/image-widget.css: {}
+      css/layout/image-widget.css: {}
 
 system.admin:
   version: VERSION
   css:
     component:
-      css/src/components/system-admin--admin-list.css: { weight: -10 }
-      css/src/components/system-admin--links.css: { weight: -10 }
-      css/src/components/system-admin--modules.css: { weight: -10 }
-      css/src/components/system-admin--panel.css: { weight: -10 }
-      css/src/components/system-admin--status-report.css: { weight: -10 }
+      css/components/system-admin--admin-list.css: { weight: -10 }
+      css/components/system-admin--links.css: { weight: -10 }
+      css/components/system-admin--modules.css: { weight: -10 }
+      css/components/system-admin--panel.css: { weight: -10 }
+      css/components/system-admin--status-report.css: { weight: -10 }
     layout:
-      css/src/layout/system-admin--layout.css: { weight: -10 }
+      css/layout/system-admin--layout.css: { weight: -10 }
   dependencies:
     - claro/card
 
@@ -199,7 +199,7 @@ drupal.shortcut:
     # @todo move this to components after
     #   https://www.drupal.org/project/drupal/issues/3045467 is in.
     theme:
-      css/src/components/shortcut.css: {}
+      css/components/shortcut.css: {}
 
 details-focus:
   js:
@@ -212,7 +212,7 @@ ajax:
 form.password-confirm:
   css:
     component:
-      css/src/components/form--password-confirm.css: {}
+      css/components/form--password-confirm.css: {}
   js:
     js/user.js: {}
   dependencies:
@@ -224,7 +224,7 @@ form.password-confirm:
 views:
   css:
     component:
-      css/src/components/views-exposed-form.css: {}
+      css/components/views-exposed-form.css: {}
 
 messages:
   js:
@@ -233,17 +233,17 @@ messages:
 card:
   css:
     component:
-      css/src/layout/card-list.css: {}
-      css/src/components/card.css: {}
+      css/layout/card-list.css: {}
+      css/components/card.css: {}
 
 vertical-tabs:
   css:
     component:
-      css/src/components/vertical-tabs.css: {}
+      css/components/vertical-tabs.css: {}
   dependencies:
     - claro/global-styling
 
 file:
   css:
     component:
-      css/src/components/file.css: {}
+      css/components/file.css: {}
diff --git a/core/themes/claro/css/src/base/elements.css b/core/themes/claro/css/base/elements.css
similarity index 100%
rename from core/themes/claro/css/src/base/elements.css
rename to core/themes/claro/css/base/elements.css
diff --git a/core/themes/claro/css/src/base/elements.pcss.css b/core/themes/claro/css/base/elements.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/base/elements.pcss.css
rename to core/themes/claro/css/base/elements.pcss.css
diff --git a/core/themes/claro/css/src/base/print.css b/core/themes/claro/css/base/print.css
similarity index 100%
rename from core/themes/claro/css/src/base/print.css
rename to core/themes/claro/css/base/print.css
diff --git a/core/themes/claro/css/src/base/print.pcss.css b/core/themes/claro/css/base/print.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/base/print.pcss.css
rename to core/themes/claro/css/base/print.pcss.css
diff --git a/core/themes/claro/css/src/base/typography.css b/core/themes/claro/css/base/typography.css
similarity index 100%
rename from core/themes/claro/css/src/base/typography.css
rename to core/themes/claro/css/base/typography.css
diff --git a/core/themes/claro/css/src/base/typography.pcss.css b/core/themes/claro/css/base/typography.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/base/typography.pcss.css
rename to core/themes/claro/css/base/typography.pcss.css
diff --git a/core/themes/claro/css/src/base/variables.css b/core/themes/claro/css/base/variables.css
similarity index 100%
rename from core/themes/claro/css/src/base/variables.css
rename to core/themes/claro/css/base/variables.css
diff --git a/core/themes/claro/css/src/base/variables.pcss.css b/core/themes/claro/css/base/variables.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/base/variables.pcss.css
rename to core/themes/claro/css/base/variables.pcss.css
diff --git a/core/themes/claro/css/src/components/accordion.css b/core/themes/claro/css/components/accordion.css
similarity index 100%
rename from core/themes/claro/css/src/components/accordion.css
rename to core/themes/claro/css/components/accordion.css
diff --git a/core/themes/claro/css/src/components/accordion.pcss.css b/core/themes/claro/css/components/accordion.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/accordion.pcss.css
rename to core/themes/claro/css/components/accordion.pcss.css
diff --git a/core/themes/claro/css/src/components/action-link.css b/core/themes/claro/css/components/action-link.css
similarity index 100%
rename from core/themes/claro/css/src/components/action-link.css
rename to core/themes/claro/css/components/action-link.css
diff --git a/core/themes/claro/css/src/components/action-link.pcss.css b/core/themes/claro/css/components/action-link.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/action-link.pcss.css
rename to core/themes/claro/css/components/action-link.pcss.css
diff --git a/core/themes/claro/css/src/components/ajax-progress.module.css b/core/themes/claro/css/components/ajax-progress.module.css
similarity index 100%
rename from core/themes/claro/css/src/components/ajax-progress.module.css
rename to core/themes/claro/css/components/ajax-progress.module.css
diff --git a/core/themes/claro/css/src/components/ajax-progress.module.pcss.css b/core/themes/claro/css/components/ajax-progress.module.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/ajax-progress.module.pcss.css
rename to core/themes/claro/css/components/ajax-progress.module.pcss.css
diff --git a/core/themes/claro/css/src/components/autocomplete-loading.module.css b/core/themes/claro/css/components/autocomplete-loading.module.css
similarity index 98%
rename from core/themes/claro/css/src/components/autocomplete-loading.module.css
rename to core/themes/claro/css/components/autocomplete-loading.module.css
index dde906a455..23c2ee8484 100644
--- a/core/themes/claro/css/src/components/autocomplete-loading.module.css
+++ b/core/themes/claro/css/components/autocomplete-loading.module.css
@@ -104,7 +104,7 @@
 
 _:-ms-fullscreen,
 .js .form-autocomplete.is-autocompleting {
-  background-image: url("../../../images/spinner-ltr.gif");
+  background-image: url(../../images/spinner-ltr.gif);
   background-size: 2.5rem 1.25rem;
 }
 
@@ -112,7 +112,7 @@ _:-ms-fullscreen,
 
 _:-ms-fullscreen,
 .js[dir="rtl"] .form-autocomplete.is-autocompleting {
-  background-image: url("../../../images/spinner-rtl.gif");
+  background-image: url(../../images/spinner-rtl.gif);
 }
 
 /**
diff --git a/core/themes/claro/css/src/components/autocomplete-loading.module.pcss.css b/core/themes/claro/css/components/autocomplete-loading.module.pcss.css
similarity index 97%
rename from core/themes/claro/css/src/components/autocomplete-loading.module.pcss.css
rename to core/themes/claro/css/components/autocomplete-loading.module.pcss.css
index 828fe2b2a4..0e39388478 100644
--- a/core/themes/claro/css/src/components/autocomplete-loading.module.pcss.css
+++ b/core/themes/claro/css/components/autocomplete-loading.module.pcss.css
@@ -48,13 +48,13 @@
 /* stylelint-disable-next-line selector-type-no-unknown */
 _:-ms-fullscreen,
 .js .form-autocomplete.is-autocompleting {
-  background-image: url("../../../images/spinner-ltr.gif");
+  background-image: url(../../images/spinner-ltr.gif);
   background-size: 2.5rem 1.25rem;
 }
 /* stylelint-disable-next-line selector-type-no-unknown */
 _:-ms-fullscreen,
 .js[dir="rtl"] .form-autocomplete.is-autocompleting {
-  background-image: url("../../../images/spinner-rtl.gif");
+  background-image: url(../../images/spinner-rtl.gif);
 }
 
 /**
diff --git a/core/themes/claro/css/src/components/breadcrumb.css b/core/themes/claro/css/components/breadcrumb.css
similarity index 100%
rename from core/themes/claro/css/src/components/breadcrumb.css
rename to core/themes/claro/css/components/breadcrumb.css
diff --git a/core/themes/claro/css/src/components/breadcrumb.pcss.css b/core/themes/claro/css/components/breadcrumb.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/breadcrumb.pcss.css
rename to core/themes/claro/css/components/breadcrumb.pcss.css
diff --git a/core/themes/claro/css/src/components/button.css b/core/themes/claro/css/components/button.css
similarity index 100%
rename from core/themes/claro/css/src/components/button.css
rename to core/themes/claro/css/components/button.css
diff --git a/core/themes/claro/css/src/components/button.pcss.css b/core/themes/claro/css/components/button.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/button.pcss.css
rename to core/themes/claro/css/components/button.pcss.css
diff --git a/core/themes/claro/css/src/components/card.css b/core/themes/claro/css/components/card.css
similarity index 100%
rename from core/themes/claro/css/src/components/card.css
rename to core/themes/claro/css/components/card.css
diff --git a/core/themes/claro/css/src/components/card.pcss.css b/core/themes/claro/css/components/card.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/card.pcss.css
rename to core/themes/claro/css/components/card.pcss.css
diff --git a/core/themes/claro/css/src/components/container-inline.css b/core/themes/claro/css/components/container-inline.css
similarity index 100%
rename from core/themes/claro/css/src/components/container-inline.css
rename to core/themes/claro/css/components/container-inline.css
diff --git a/core/themes/claro/css/src/components/container-inline.module.css b/core/themes/claro/css/components/container-inline.module.css
similarity index 100%
rename from core/themes/claro/css/src/components/container-inline.module.css
rename to core/themes/claro/css/components/container-inline.module.css
diff --git a/core/themes/claro/css/src/components/container-inline.module.pcss.css b/core/themes/claro/css/components/container-inline.module.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/container-inline.module.pcss.css
rename to core/themes/claro/css/components/container-inline.module.pcss.css
diff --git a/core/themes/claro/css/src/components/container-inline.pcss.css b/core/themes/claro/css/components/container-inline.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/container-inline.pcss.css
rename to core/themes/claro/css/components/container-inline.pcss.css
diff --git a/core/themes/claro/css/src/components/content-header.css b/core/themes/claro/css/components/content-header.css
similarity index 100%
rename from core/themes/claro/css/src/components/content-header.css
rename to core/themes/claro/css/components/content-header.css
diff --git a/core/themes/claro/css/src/components/content-header.pcss.css b/core/themes/claro/css/components/content-header.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/content-header.pcss.css
rename to core/themes/claro/css/components/content-header.pcss.css
diff --git a/core/themes/claro/css/src/components/details.css b/core/themes/claro/css/components/details.css
similarity index 99%
rename from core/themes/claro/css/src/components/details.css
rename to core/themes/claro/css/components/details.css
index 14d5624ea4..cf7a03192f 100644
--- a/core/themes/claro/css/src/components/details.css
+++ b/core/themes/claro/css/components/details.css
@@ -699,7 +699,7 @@ rgba(0, 0, 0, 0.1);
   margin-left: 0.3em;
   content: "";
   vertical-align: super;
-  background-image: url(../../../images/core/ee0000/required.svg);
+  background-image: url(../../../../misc/icons/ee0000/required.svg);
   background-repeat: no-repeat;
   background-size: 0.4375rem 0.4375rem;
 }
diff --git a/core/themes/claro/css/src/components/details.pcss.css b/core/themes/claro/css/components/details.pcss.css
similarity index 99%
rename from core/themes/claro/css/src/components/details.pcss.css
rename to core/themes/claro/css/components/details.pcss.css
index a0d5be5074..971bd8f75c 100644
--- a/core/themes/claro/css/src/components/details.pcss.css
+++ b/core/themes/claro/css/components/details.pcss.css
@@ -562,7 +562,7 @@
   margin-left: 0.3em;
   content: "";
   vertical-align: super;
-  background-image: url(../../../images/core/ee0000/required.svg);
+  background-image: url(../../../../misc/icons/ee0000/required.svg);
   background-repeat: no-repeat;
   background-size: 0.4375rem 0.4375rem;
 }
diff --git a/core/themes/claro/css/src/components/dialog.css b/core/themes/claro/css/components/dialog.css
similarity index 95%
rename from core/themes/claro/css/src/components/dialog.css
rename to core/themes/claro/css/components/dialog.css
index fb56fd9bbb..1443d1e900 100644
--- a/core/themes/claro/css/src/components/dialog.css
+++ b/core/themes/claro/css/components/dialog.css
@@ -73,7 +73,7 @@
 
 .ui-dialog .ui-icon.ui-icon-closethick {
   margin-top: -8px;
-  background: url(../../../images/core/ffffff/ex.svg) 0 0 no-repeat;
+  background: url(../../../../misc/icons/ffffff/ex.svg) 0 0 no-repeat;
 }
 
 .ui-dialog .ui-widget-content.ui-dialog-content {
@@ -128,7 +128,7 @@
   opacity: 0.9;
   border-radius: 7px;
   background-color: #232323;
-  background-image: url(../../../images/loading-small.gif);
+  background-image: url(../../../../misc/loading-small.gif);
   background-repeat: no-repeat;
   background-position: center center;
 }
diff --git a/core/themes/claro/css/src/components/dialog.pcss.css b/core/themes/claro/css/components/dialog.pcss.css
similarity index 95%
rename from core/themes/claro/css/src/components/dialog.pcss.css
rename to core/themes/claro/css/components/dialog.pcss.css
index 171ba798b0..da49385681 100644
--- a/core/themes/claro/css/src/components/dialog.pcss.css
+++ b/core/themes/claro/css/components/dialog.pcss.css
@@ -57,7 +57,7 @@
 }
 .ui-dialog .ui-icon.ui-icon-closethick {
   margin-top: -8px;
-  background: url(../../../images/core/ffffff/ex.svg) 0 0 no-repeat;
+  background: url(../../../../misc/icons/ffffff/ex.svg) 0 0 no-repeat;
 }
 .ui-dialog .ui-widget-content.ui-dialog-content {
   overflow: auto;
@@ -104,7 +104,7 @@
   opacity: 0.9;
   border-radius: 7px;
   background-color: #232323;
-  background-image: url(../../../images/loading-small.gif);
+  background-image: url(../../../../misc/loading-small.gif);
   background-repeat: no-repeat;
   background-position: center center;
 }
diff --git a/core/themes/claro/css/src/components/divider.css b/core/themes/claro/css/components/divider.css
similarity index 100%
rename from core/themes/claro/css/src/components/divider.css
rename to core/themes/claro/css/components/divider.css
diff --git a/core/themes/claro/css/src/components/divider.pcss.css b/core/themes/claro/css/components/divider.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/divider.pcss.css
rename to core/themes/claro/css/components/divider.pcss.css
diff --git a/core/themes/claro/css/src/components/dropbutton.css b/core/themes/claro/css/components/dropbutton.css
similarity index 100%
rename from core/themes/claro/css/src/components/dropbutton.css
rename to core/themes/claro/css/components/dropbutton.css
diff --git a/core/themes/claro/css/src/components/dropbutton.pcss.css b/core/themes/claro/css/components/dropbutton.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/dropbutton.pcss.css
rename to core/themes/claro/css/components/dropbutton.pcss.css
diff --git a/core/themes/claro/css/src/components/entity-meta.css b/core/themes/claro/css/components/entity-meta.css
similarity index 100%
rename from core/themes/claro/css/src/components/entity-meta.css
rename to core/themes/claro/css/components/entity-meta.css
diff --git a/core/themes/claro/css/src/components/entity-meta.pcss.css b/core/themes/claro/css/components/entity-meta.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/entity-meta.pcss.css
rename to core/themes/claro/css/components/entity-meta.pcss.css
diff --git a/core/themes/claro/css/src/components/fieldset.css b/core/themes/claro/css/components/fieldset.css
similarity index 100%
rename from core/themes/claro/css/src/components/fieldset.css
rename to core/themes/claro/css/components/fieldset.css
diff --git a/core/themes/claro/css/src/components/fieldset.pcss.css b/core/themes/claro/css/components/fieldset.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/fieldset.pcss.css
rename to core/themes/claro/css/components/fieldset.pcss.css
diff --git a/core/themes/claro/css/src/components/file.css b/core/themes/claro/css/components/file.css
similarity index 100%
rename from core/themes/claro/css/src/components/file.css
rename to core/themes/claro/css/components/file.css
diff --git a/core/themes/claro/css/src/components/file.pcss.css b/core/themes/claro/css/components/file.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/file.pcss.css
rename to core/themes/claro/css/components/file.pcss.css
diff --git a/core/themes/claro/css/src/components/form--checkbox-radio--ie.css b/core/themes/claro/css/components/form--checkbox-radio--ie.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--checkbox-radio--ie.css
rename to core/themes/claro/css/components/form--checkbox-radio--ie.css
diff --git a/core/themes/claro/css/src/components/form--checkbox-radio--ie.pcss.css b/core/themes/claro/css/components/form--checkbox-radio--ie.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--checkbox-radio--ie.pcss.css
rename to core/themes/claro/css/components/form--checkbox-radio--ie.pcss.css
diff --git a/core/themes/claro/css/src/components/form--checkbox-radio.css b/core/themes/claro/css/components/form--checkbox-radio.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--checkbox-radio.css
rename to core/themes/claro/css/components/form--checkbox-radio.css
diff --git a/core/themes/claro/css/src/components/form--checkbox-radio.pcss.css b/core/themes/claro/css/components/form--checkbox-radio.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--checkbox-radio.pcss.css
rename to core/themes/claro/css/components/form--checkbox-radio.pcss.css
diff --git a/core/themes/claro/css/src/components/form--field-multiple.css b/core/themes/claro/css/components/form--field-multiple.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--field-multiple.css
rename to core/themes/claro/css/components/form--field-multiple.css
diff --git a/core/themes/claro/css/src/components/form--field-multiple.pcss.css b/core/themes/claro/css/components/form--field-multiple.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--field-multiple.pcss.css
rename to core/themes/claro/css/components/form--field-multiple.pcss.css
diff --git a/core/themes/claro/css/src/components/form--managed-file.css b/core/themes/claro/css/components/form--managed-file.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--managed-file.css
rename to core/themes/claro/css/components/form--managed-file.css
diff --git a/core/themes/claro/css/src/components/form--managed-file.pcss.css b/core/themes/claro/css/components/form--managed-file.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--managed-file.pcss.css
rename to core/themes/claro/css/components/form--managed-file.pcss.css
diff --git a/core/themes/claro/css/src/components/form--password-confirm.css b/core/themes/claro/css/components/form--password-confirm.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--password-confirm.css
rename to core/themes/claro/css/components/form--password-confirm.css
diff --git a/core/themes/claro/css/src/components/form--password-confirm.pcss.css b/core/themes/claro/css/components/form--password-confirm.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--password-confirm.pcss.css
rename to core/themes/claro/css/components/form--password-confirm.pcss.css
diff --git a/core/themes/claro/css/src/components/form--select.css b/core/themes/claro/css/components/form--select.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--select.css
rename to core/themes/claro/css/components/form--select.css
diff --git a/core/themes/claro/css/src/components/form--select.pcss.css b/core/themes/claro/css/components/form--select.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--select.pcss.css
rename to core/themes/claro/css/components/form--select.pcss.css
diff --git a/core/themes/claro/css/src/components/form--text.css b/core/themes/claro/css/components/form--text.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--text.css
rename to core/themes/claro/css/components/form--text.css
diff --git a/core/themes/claro/css/src/components/form--text.pcss.css b/core/themes/claro/css/components/form--text.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/form--text.pcss.css
rename to core/themes/claro/css/components/form--text.pcss.css
diff --git a/core/themes/claro/css/src/components/form.css b/core/themes/claro/css/components/form.css
similarity index 98%
rename from core/themes/claro/css/src/components/form.css
rename to core/themes/claro/css/components/form.css
index 56cb04893d..7119cbd744 100644
--- a/core/themes/claro/css/src/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -160,7 +160,7 @@ tr .form-item,
   content: "";
   vertical-align: super;
   /* Use a background image to prevent screen readers from announcing the text. */
-  background-image: url(../../../images/core/ee0000/required.svg);
+  background-image: url(../../../../misc/icons/ee0000/required.svg);
   background-repeat: no-repeat;
   background-size: 0.4375rem 0.4375rem;
 }
diff --git a/core/themes/claro/css/src/components/form.pcss.css b/core/themes/claro/css/components/form.pcss.css
similarity index 98%
rename from core/themes/claro/css/src/components/form.pcss.css
rename to core/themes/claro/css/components/form.pcss.css
index 81e698abe5..28017f051c 100644
--- a/core/themes/claro/css/src/components/form.pcss.css
+++ b/core/themes/claro/css/components/form.pcss.css
@@ -77,7 +77,7 @@ tr .form-item,
   content: "";
   vertical-align: super;
   /* Use a background image to prevent screen readers from announcing the text. */
-  background-image: url(../../../images/core/ee0000/required.svg);
+  background-image: url(../../../../misc/icons/ee0000/required.svg);
   background-repeat: no-repeat;
   background-size: var(--input--required-mark-size) var(--input--required-mark-size);
 }
diff --git a/core/themes/claro/css/src/components/help.css b/core/themes/claro/css/components/help.css
similarity index 100%
rename from core/themes/claro/css/src/components/help.css
rename to core/themes/claro/css/components/help.css
diff --git a/core/themes/claro/css/src/components/help.pcss.css b/core/themes/claro/css/components/help.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/help.pcss.css
rename to core/themes/claro/css/components/help.pcss.css
diff --git a/core/themes/claro/css/src/components/image-preview.css b/core/themes/claro/css/components/image-preview.css
similarity index 100%
rename from core/themes/claro/css/src/components/image-preview.css
rename to core/themes/claro/css/components/image-preview.css
diff --git a/core/themes/claro/css/src/components/image-preview.pcss.css b/core/themes/claro/css/components/image-preview.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/image-preview.pcss.css
rename to core/themes/claro/css/components/image-preview.pcss.css
diff --git a/core/themes/claro/css/src/components/jquery.ui/theme.css b/core/themes/claro/css/components/jquery.ui/theme.css
similarity index 97%
rename from core/themes/claro/css/src/components/jquery.ui/theme.css
rename to core/themes/claro/css/components/jquery.ui/theme.css
index 1c40c3c1f4..004d55e156 100644
--- a/core/themes/claro/css/src/components/jquery.ui/theme.css
+++ b/core/themes/claro/css/components/jquery.ui/theme.css
@@ -122,32 +122,32 @@
   width: 16px;
   height: 16px;
   text-indent: -99999px;
-  background-image: url(../../../../images/ui-icons-222222-256x240.png);
+  background-image: url(../../../images/ui-icons-222222-256x240.png);
   background-repeat: no-repeat;
 }
 
 .ui-widget-content .ui-icon,
 .ui-widget-header .ui-icon {
-  background-image: url(../../../../images/ui-icons-222222-256x240.png);
+  background-image: url(../../../images/ui-icons-222222-256x240.png);
 }
 
 .ui-state-default .ui-icon {
-  background-image: url(../../../../images/ui-icons-888888-256x240.png);
+  background-image: url(../../../images/ui-icons-888888-256x240.png);
 }
 
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon,
 .ui-state-highlight .ui-icon {
-  background-image: url(../../../../images/ui-icons-454545-256x240.png);
+  background-image: url(../../../images/ui-icons-454545-256x240.png);
 }
 
 .ui-state-active .ui-icon {
-  background-image: url(../../../../images/ui-icons-800000-256x240.png);
+  background-image: url(../../../images/ui-icons-800000-256x240.png);
 }
 
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-  background-image: url(../../../../images/ui-icons-ffffff-256x240.png);
+  background-image: url(../../../images/ui-icons-ffffff-256x240.png);
 }
 
 .ui-widget p .ui-icon {
@@ -628,7 +628,7 @@
 
 .ui-progressbar .ui-progressbar-value {
   height: 1.5em;
-  background: #0072b9 url(../../../../../misc/progress.gif);
+  background: #0072b9 url(../../../../misc/progress.gif);
 }
 
 /**
diff --git a/core/themes/claro/css/src/components/jquery.ui/theme.pcss.css b/core/themes/claro/css/components/jquery.ui/theme.pcss.css
similarity index 96%
rename from core/themes/claro/css/src/components/jquery.ui/theme.pcss.css
rename to core/themes/claro/css/components/jquery.ui/theme.pcss.css
index 19ab965346..ff8e882395 100644
--- a/core/themes/claro/css/src/components/jquery.ui/theme.pcss.css
+++ b/core/themes/claro/css/components/jquery.ui/theme.pcss.css
@@ -63,27 +63,27 @@
   width: 16px;
   height: 16px;
   text-indent: -99999px;
-  background-image: url(../../../../images/ui-icons-222222-256x240.png);
+  background-image: url(../../../images/ui-icons-222222-256x240.png);
   background-repeat: no-repeat;
 }
 .ui-widget-content .ui-icon,
 .ui-widget-header .ui-icon {
-  background-image: url(../../../../images/ui-icons-222222-256x240.png);
+  background-image: url(../../../images/ui-icons-222222-256x240.png);
 }
 .ui-state-default .ui-icon {
-  background-image: url(../../../../images/ui-icons-888888-256x240.png);
+  background-image: url(../../../images/ui-icons-888888-256x240.png);
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon,
 .ui-state-highlight .ui-icon {
-  background-image: url(../../../../images/ui-icons-454545-256x240.png);
+  background-image: url(../../../images/ui-icons-454545-256x240.png);
 }
 .ui-state-active .ui-icon {
-  background-image: url(../../../../images/ui-icons-800000-256x240.png);
+  background-image: url(../../../images/ui-icons-800000-256x240.png);
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-  background-image: url(../../../../images/ui-icons-ffffff-256x240.png);
+  background-image: url(../../../images/ui-icons-ffffff-256x240.png);
 }
 .ui-widget p .ui-icon {
   margin: 2px 3px 0 0; /* LTR */
@@ -370,7 +370,7 @@
 }
 .ui-progressbar .ui-progressbar-value {
   height: 1.5em;
-  background: #0072b9 url(../../../../../misc/progress.gif);
+  background: #0072b9 url(../../../../misc/progress.gif);
 }
 
 /**
diff --git a/core/themes/claro/css/src/components/media.css b/core/themes/claro/css/components/media.css
similarity index 100%
rename from core/themes/claro/css/src/components/media.css
rename to core/themes/claro/css/components/media.css
diff --git a/core/themes/claro/css/src/components/media.pcss.css b/core/themes/claro/css/components/media.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/media.pcss.css
rename to core/themes/claro/css/components/media.pcss.css
diff --git a/core/themes/claro/css/src/components/menus-and-lists.css b/core/themes/claro/css/components/menus-and-lists.css
similarity index 74%
rename from core/themes/claro/css/src/components/menus-and-lists.css
rename to core/themes/claro/css/components/menus-and-lists.css
index cf0c42a8d6..b66af345e5 100644
--- a/core/themes/claro/css/src/components/menus-and-lists.css
+++ b/core/themes/claro/css/components/menus-and-lists.css
@@ -26,12 +26,16 @@
 .item-list ul li.collapsed,
 .menu-item--collapsed {
   list-style-type: disc;
-  list-style-image: url(../../../images/menu-collapsed.png);
+  list-style-image: url(../../../../misc/menu-collapsed.png); /* LTR */
+}
+[dir="rtl"] .item-list ul li.collapsed,
+[dir="rtl"] .menu-item--collapsed {
+  list-style-image: url(../../../../misc/menu-collapsed-rtl.png);
 }
 .item-list ul li.expanded,
 .menu-item--expanded {
   list-style-type: circle;
-  list-style-image: url(../../../images/menu-expanded.png);
+  list-style-image: url(../../../../misc/menu-expanded.png);
 }
 ul.links li,
 ul.inline li {
diff --git a/core/themes/claro/css/src/components/menus-and-lists.pcss.css b/core/themes/claro/css/components/menus-and-lists.pcss.css
similarity index 70%
rename from core/themes/claro/css/src/components/menus-and-lists.pcss.css
rename to core/themes/claro/css/components/menus-and-lists.pcss.css
index 9fd9b61168..53e5ceeac4 100644
--- a/core/themes/claro/css/src/components/menus-and-lists.pcss.css
+++ b/core/themes/claro/css/components/menus-and-lists.pcss.css
@@ -20,12 +20,17 @@
 .item-list ul li.collapsed,
 .menu-item--collapsed {
   list-style-type: disc;
-  list-style-image: url(../../../images/menu-collapsed.png);
+  list-style-image: url(../../../../misc/menu-collapsed.png); /* LTR */
 }
+[dir="rtl"] .item-list ul li.collapsed,
+[dir="rtl"] .menu-item--collapsed {
+  list-style-image: url(../../../../misc/menu-collapsed-rtl.png);
+}
+
 .item-list ul li.expanded,
 .menu-item--expanded {
   list-style-type: circle;
-  list-style-image: url(../../../images/menu-expanded.png);
+  list-style-image: url(../../../../misc/menu-expanded.png);
 }
 ul.links li,
 ul.inline li {
diff --git a/core/themes/claro/css/src/components/messages.css b/core/themes/claro/css/components/messages.css
similarity index 100%
rename from core/themes/claro/css/src/components/messages.css
rename to core/themes/claro/css/components/messages.css
diff --git a/core/themes/claro/css/src/components/messages.pcss.css b/core/themes/claro/css/components/messages.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/messages.pcss.css
rename to core/themes/claro/css/components/messages.pcss.css
diff --git a/core/themes/claro/css/src/components/modules-page.css b/core/themes/claro/css/components/modules-page.css
similarity index 100%
rename from core/themes/claro/css/src/components/modules-page.css
rename to core/themes/claro/css/components/modules-page.css
diff --git a/core/themes/claro/css/src/components/modules-page.pcss.css b/core/themes/claro/css/components/modules-page.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/modules-page.pcss.css
rename to core/themes/claro/css/components/modules-page.pcss.css
diff --git a/core/themes/claro/css/src/components/node.css b/core/themes/claro/css/components/node.css
similarity index 100%
rename from core/themes/claro/css/src/components/node.css
rename to core/themes/claro/css/components/node.css
diff --git a/core/themes/claro/css/src/components/node.pcss.css b/core/themes/claro/css/components/node.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/node.pcss.css
rename to core/themes/claro/css/components/node.pcss.css
diff --git a/core/themes/claro/css/src/components/page-title.css b/core/themes/claro/css/components/page-title.css
similarity index 100%
rename from core/themes/claro/css/src/components/page-title.css
rename to core/themes/claro/css/components/page-title.css
diff --git a/core/themes/claro/css/src/components/page-title.pcss.css b/core/themes/claro/css/components/page-title.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/page-title.pcss.css
rename to core/themes/claro/css/components/page-title.pcss.css
diff --git a/core/themes/claro/css/src/components/pager.css b/core/themes/claro/css/components/pager.css
similarity index 100%
rename from core/themes/claro/css/src/components/pager.css
rename to core/themes/claro/css/components/pager.css
diff --git a/core/themes/claro/css/src/components/pager.pcss.css b/core/themes/claro/css/components/pager.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/pager.pcss.css
rename to core/themes/claro/css/components/pager.pcss.css
diff --git a/core/themes/claro/css/src/components/progress.css b/core/themes/claro/css/components/progress.css
similarity index 100%
rename from core/themes/claro/css/src/components/progress.css
rename to core/themes/claro/css/components/progress.css
diff --git a/core/themes/claro/css/src/components/progress.pcss.css b/core/themes/claro/css/components/progress.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/progress.pcss.css
rename to core/themes/claro/css/components/progress.pcss.css
diff --git a/core/themes/claro/css/src/components/quickedit.css b/core/themes/claro/css/components/quickedit.css
similarity index 100%
rename from core/themes/claro/css/src/components/quickedit.css
rename to core/themes/claro/css/components/quickedit.css
diff --git a/core/themes/claro/css/src/components/quickedit.pcss.css b/core/themes/claro/css/components/quickedit.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/quickedit.pcss.css
rename to core/themes/claro/css/components/quickedit.pcss.css
diff --git a/core/themes/claro/css/src/components/search-admin-settings.css b/core/themes/claro/css/components/search-admin-settings.css
similarity index 100%
rename from core/themes/claro/css/src/components/search-admin-settings.css
rename to core/themes/claro/css/components/search-admin-settings.css
diff --git a/core/themes/claro/css/src/components/search-admin-settings.pcss.css b/core/themes/claro/css/components/search-admin-settings.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/search-admin-settings.pcss.css
rename to core/themes/claro/css/components/search-admin-settings.pcss.css
diff --git a/core/themes/claro/css/src/components/shortcut.css b/core/themes/claro/css/components/shortcut.css
similarity index 95%
rename from core/themes/claro/css/src/components/shortcut.css
rename to core/themes/claro/css/components/shortcut.css
index e4c152b0cc..e64fb62d1d 100644
--- a/core/themes/claro/css/src/components/shortcut.css
+++ b/core/themes/claro/css/components/shortcut.css
@@ -126,11 +126,11 @@ ease-out;
   width: 1.5rem;
   height: 1.5rem;
   vertical-align: -0.0625rem;
-  background: transparent url(../../../images/shortcut/favstar.svg) left top / 6rem 1.5rem no-repeat;
+  background: transparent url(../../images/shortcut/favstar.svg) left top / 6rem 1.5rem no-repeat; /* LTR */
 }
 
 [dir="rtl"] .shortcut-action__icon {
-  background-image: url(../../../images/shortcut/favstar-rtl.svg);
+  background-image: url(../../images/shortcut/favstar-rtl.svg);
 }
 
 .shortcut-action--add:hover .shortcut-action__icon,
diff --git a/core/themes/claro/css/src/components/shortcut.pcss.css b/core/themes/claro/css/components/shortcut.pcss.css
similarity index 89%
rename from core/themes/claro/css/src/components/shortcut.pcss.css
rename to core/themes/claro/css/components/shortcut.pcss.css
index 4b6833a7c3..e74814ff86 100644
--- a/core/themes/claro/css/src/components/shortcut.pcss.css
+++ b/core/themes/claro/css/components/shortcut.pcss.css
@@ -55,10 +55,10 @@
   width: var(--shortcut-icon-size);
   height: var(--shortcut-icon-size);
   vertical-align: -0.0625rem;
-  background: transparent url(../../../images/shortcut/favstar.svg) left top / calc(var(--shortcut-icon-size) * 4) var(--shortcut-icon-size) no-repeat;
+  background: transparent url(../../images/shortcut/favstar.svg) left top / calc(var(--shortcut-icon-size) * 4) var(--shortcut-icon-size) no-repeat; /* LTR */
 }
 [dir="rtl"] .shortcut-action__icon {
-  background-image: url(../../../images/shortcut/favstar-rtl.svg);
+  background-image: url(../../images/shortcut/favstar-rtl.svg);
 }
 .shortcut-action--add:hover .shortcut-action__icon,
 .shortcut-action--add:focus .shortcut-action__icon {
diff --git a/core/themes/claro/css/src/components/skip-link.css b/core/themes/claro/css/components/skip-link.css
similarity index 100%
rename from core/themes/claro/css/src/components/skip-link.css
rename to core/themes/claro/css/components/skip-link.css
diff --git a/core/themes/claro/css/src/components/skip-link.pcss.css b/core/themes/claro/css/components/skip-link.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/skip-link.pcss.css
rename to core/themes/claro/css/components/skip-link.pcss.css
diff --git a/core/themes/claro/css/src/components/system-admin--admin-list.css b/core/themes/claro/css/components/system-admin--admin-list.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--admin-list.css
rename to core/themes/claro/css/components/system-admin--admin-list.css
diff --git a/core/themes/claro/css/src/components/system-admin--admin-list.pcss.css b/core/themes/claro/css/components/system-admin--admin-list.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--admin-list.pcss.css
rename to core/themes/claro/css/components/system-admin--admin-list.pcss.css
diff --git a/core/themes/claro/css/src/components/system-admin--links.css b/core/themes/claro/css/components/system-admin--links.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--links.css
rename to core/themes/claro/css/components/system-admin--links.css
diff --git a/core/themes/claro/css/src/components/system-admin--links.pcss.css b/core/themes/claro/css/components/system-admin--links.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--links.pcss.css
rename to core/themes/claro/css/components/system-admin--links.pcss.css
diff --git a/core/themes/claro/css/src/components/system-admin--modules.css b/core/themes/claro/css/components/system-admin--modules.css
similarity index 89%
rename from core/themes/claro/css/src/components/system-admin--modules.css
rename to core/themes/claro/css/components/system-admin--modules.css
index f57c40418f..1f04a3c9d5 100644
--- a/core/themes/claro/css/src/components/system-admin--modules.css
+++ b/core/themes/claro/css/components/system-admin--modules.css
@@ -140,7 +140,7 @@
 }
 
 .module-link-help {
-  background: url(../../../images/core/787878/questionmark-disc.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/questionmark-disc.svg) 0 50% no-repeat; /* LTR */
 }
 
 [dir="rtl"] .module-link-help {
@@ -148,7 +148,7 @@
 }
 
 .module-link-permissions {
-  background: url(../../../images/core/787878/key.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/key.svg) 0 50% no-repeat; /* LTR */
 }
 
 [dir="rtl"] .module-link-permissions {
@@ -156,7 +156,7 @@
 }
 
 .module-link-configure {
-  background: url(../../../images/core/787878/cog.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/cog.svg) 0 50% no-repeat; /* LTR */
 }
 
 [dir="rtl"] .module-link-configure {
diff --git a/core/themes/claro/css/src/components/system-admin--modules.pcss.css b/core/themes/claro/css/components/system-admin--modules.pcss.css
similarity index 88%
rename from core/themes/claro/css/src/components/system-admin--modules.pcss.css
rename to core/themes/claro/css/components/system-admin--modules.pcss.css
index 06d6b0d96f..5535513da7 100644
--- a/core/themes/claro/css/src/components/system-admin--modules.pcss.css
+++ b/core/themes/claro/css/components/system-admin--modules.pcss.css
@@ -106,19 +106,19 @@
   float: right;
 }
 .module-link-help {
-  background: url(../../../images/core/787878/questionmark-disc.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/questionmark-disc.svg) 0 50% no-repeat; /* LTR */
 }
 [dir="rtl"] .module-link-help {
   background-position: top 50% right 0;
 }
 .module-link-permissions {
-  background: url(../../../images/core/787878/key.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/key.svg) 0 50% no-repeat; /* LTR */
 }
 [dir="rtl"] .module-link-permissions {
   background-position: top 50% right 0;
 }
 .module-link-configure {
-  background: url(../../../images/core/787878/cog.svg) 0 50% no-repeat; /* LTR */
+  background: url(../../../../misc/icons/787878/cog.svg) 0 50% no-repeat; /* LTR */
 }
 [dir="rtl"] .module-link-configure {
   background-position: top 50% right 0;
diff --git a/core/themes/claro/css/src/components/system-admin--panel.css b/core/themes/claro/css/components/system-admin--panel.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--panel.css
rename to core/themes/claro/css/components/system-admin--panel.css
diff --git a/core/themes/claro/css/src/components/system-admin--panel.pcss.css b/core/themes/claro/css/components/system-admin--panel.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-admin--panel.pcss.css
rename to core/themes/claro/css/components/system-admin--panel.pcss.css
diff --git a/core/themes/claro/css/src/components/system-admin--status-report.css b/core/themes/claro/css/components/system-admin--status-report.css
similarity index 91%
rename from core/themes/claro/css/src/components/system-admin--status-report.css
rename to core/themes/claro/css/components/system-admin--status-report.css
index 127a3aec7c..e095f9e7b8 100644
--- a/core/themes/claro/css/src/components/system-admin--status-report.css
+++ b/core/themes/claro/css/components/system-admin--status-report.css
@@ -50,11 +50,11 @@
 }
 
 .system-status-report__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 
 .system-status-report__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 
 .system-status-report__entry__value {
diff --git a/core/themes/claro/css/src/components/system-admin--status-report.pcss.css b/core/themes/claro/css/components/system-admin--status-report.pcss.css
similarity index 89%
rename from core/themes/claro/css/src/components/system-admin--status-report.pcss.css
rename to core/themes/claro/css/components/system-admin--status-report.pcss.css
index 0f09883cb3..72058cad03 100644
--- a/core/themes/claro/css/src/components/system-admin--status-report.pcss.css
+++ b/core/themes/claro/css/components/system-admin--status-report.pcss.css
@@ -37,10 +37,10 @@
   left: auto;
 }
 .system-status-report__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 .system-status-report__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 .system-status-report__entry__value {
   padding: 1em 0.5em;
diff --git a/core/themes/claro/css/src/components/system-status-counter.css b/core/themes/claro/css/components/system-status-counter.css
similarity index 91%
rename from core/themes/claro/css/src/components/system-status-counter.css
rename to core/themes/claro/css/components/system-status-counter.css
index 4e6c1bbd28..ebbf1baa6e 100644
--- a/core/themes/claro/css/src/components/system-status-counter.css
+++ b/core/themes/claro/css/components/system-status-counter.css
@@ -53,15 +53,15 @@
 }
 
 .system-status-counter__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 
 .system-status-counter__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 
 .system-status-counter__status-icon--checked:before {
-  background-image: url(../../../images/core/73b355/check.svg);
+  background-image: url(../../../../misc/icons/73b355/check.svg);
 }
 
 .system-status-counter__status-title {
diff --git a/core/themes/claro/css/src/components/system-status-counter.pcss.css b/core/themes/claro/css/components/system-status-counter.pcss.css
similarity index 90%
rename from core/themes/claro/css/src/components/system-status-counter.pcss.css
rename to core/themes/claro/css/components/system-status-counter.pcss.css
index c96e797e88..43a4f3b37c 100644
--- a/core/themes/claro/css/src/components/system-status-counter.pcss.css
+++ b/core/themes/claro/css/components/system-status-counter.pcss.css
@@ -39,13 +39,13 @@
 }
 
 .system-status-counter__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 .system-status-counter__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 .system-status-counter__status-icon--checked:before {
-  background-image: url(../../../images/core/73b355/check.svg);
+  background-image: url(../../../../misc/icons/73b355/check.svg);
 }
 
 .system-status-counter__status-title {
diff --git a/core/themes/claro/css/src/components/system-status-report-counters.css b/core/themes/claro/css/components/system-status-report-counters.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-status-report-counters.css
rename to core/themes/claro/css/components/system-status-report-counters.css
diff --git a/core/themes/claro/css/src/components/system-status-report-counters.pcss.css b/core/themes/claro/css/components/system-status-report-counters.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/system-status-report-counters.pcss.css
rename to core/themes/claro/css/components/system-status-report-counters.pcss.css
diff --git a/core/themes/claro/css/src/components/system-status-report-general-info.css b/core/themes/claro/css/components/system-status-report-general-info.css
similarity index 92%
rename from core/themes/claro/css/src/components/system-status-report-general-info.css
rename to core/themes/claro/css/components/system-status-report-general-info.css
index 4910fde784..1e1ec98a49 100644
--- a/core/themes/claro/css/src/components/system-status-report-general-info.css
+++ b/core/themes/claro/css/components/system-status-report-general-info.css
@@ -54,24 +54,24 @@
 }
 
 .system-status-general-info__item-icon--d8:before {
-  background-image: url(../../../images/core/cccccc/d8-logo.svg);
+  background-image: url(../../images/icons/cccccc/d8-logo.svg);
 }
 
 .system-status-general-info__item-icon--clock:before {
-  background-image: url(../../../images/core/cccccc/clock.svg);
+  background-image: url(../../images/icons/cccccc/clock.svg);
 }
 
 .system-status-general-info__item-icon--server:before {
-  background-image: url(../../../images/core/cccccc/server.svg);
+  background-image: url(../../images/icons/cccccc/server.svg);
 }
 
 .system-status-general-info__item-icon--php:before {
-  background-image: url(../../../images/core/cccccc/php-logo.svg);
+  background-image: url(../../images/icons/cccccc/php-logo.svg);
   background-size: 45px;
 }
 
 .system-status-general-info__item-icon--database:before {
-  background-image: url(../../../images/core/cccccc/database.svg);
+  background-image: url(../../images/icons/cccccc/database.svg);
   background-size: 30px;
 }
 
diff --git a/core/themes/claro/css/src/components/system-status-report-general-info.pcss.css b/core/themes/claro/css/components/system-status-report-general-info.pcss.css
similarity index 91%
rename from core/themes/claro/css/src/components/system-status-report-general-info.pcss.css
rename to core/themes/claro/css/components/system-status-report-general-info.pcss.css
index 6374ce96ac..9a26662da2 100644
--- a/core/themes/claro/css/src/components/system-status-report-general-info.pcss.css
+++ b/core/themes/claro/css/components/system-status-report-general-info.pcss.css
@@ -43,20 +43,20 @@
   background-size: 35px;
 }
 .system-status-general-info__item-icon--d8:before {
-  background-image: url(../../../images/core/cccccc/d8-logo.svg);
+  background-image: url(../../images/icons/cccccc/d8-logo.svg);
 }
 .system-status-general-info__item-icon--clock:before {
-  background-image: url(../../../images/core/cccccc/clock.svg);
+  background-image: url(../../images/icons/cccccc/clock.svg);
 }
 .system-status-general-info__item-icon--server:before {
-  background-image: url(../../../images/core/cccccc/server.svg);
+  background-image: url(../../images/icons/cccccc/server.svg);
 }
 .system-status-general-info__item-icon--php:before {
-  background-image: url(../../../images/core/cccccc/php-logo.svg);
+  background-image: url(../../images/icons/cccccc/php-logo.svg);
   background-size: 45px;
 }
 .system-status-general-info__item-icon--database:before {
-  background-image: url(../../../images/core/cccccc/database.svg);
+  background-image: url(../../images/icons/cccccc/database.svg);
   background-size: 30px;
 }
 
diff --git a/core/themes/claro/css/src/components/system-status-report.css b/core/themes/claro/css/components/system-status-report.css
similarity index 96%
rename from core/themes/claro/css/src/components/system-status-report.css
rename to core/themes/claro/css/components/system-status-report.css
index d91c7c9f2e..e54ee05d02 100644
--- a/core/themes/claro/css/src/components/system-status-report.css
+++ b/core/themes/claro/css/components/system-status-report.css
@@ -120,12 +120,12 @@
 
 .system-status-report__status-icon--error .details-title:before,
 .details .system-status-report__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 
 .system-status-report__status-icon--warning .details-title:before,
 .details .system-status-report__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 
 .system-status-report__entry__value {
diff --git a/core/themes/claro/css/src/components/system-status-report.pcss.css b/core/themes/claro/css/components/system-status-report.pcss.css
similarity index 96%
rename from core/themes/claro/css/src/components/system-status-report.pcss.css
rename to core/themes/claro/css/components/system-status-report.pcss.css
index 1008455da5..85780d53fa 100644
--- a/core/themes/claro/css/src/components/system-status-report.pcss.css
+++ b/core/themes/claro/css/components/system-status-report.pcss.css
@@ -93,11 +93,11 @@
 }
 .system-status-report__status-icon--error .details-title:before,
 .details .system-status-report__status-icon--error:before {
-  background-image: url(../../../images/core/e32700/error.svg);
+  background-image: url(../../../../misc/icons/e32700/error.svg);
 }
 .system-status-report__status-icon--warning .details-title:before,
 .details .system-status-report__status-icon--warning:before {
-  background-image: url(../../../images/core/e29700/warning.svg);
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
 }
 
 .system-status-report__entry__value {
diff --git a/core/themes/claro/css/src/components/table--file-multiple-widget.css b/core/themes/claro/css/components/table--file-multiple-widget.css
similarity index 100%
rename from core/themes/claro/css/src/components/table--file-multiple-widget.css
rename to core/themes/claro/css/components/table--file-multiple-widget.css
diff --git a/core/themes/claro/css/src/components/table--file-multiple-widget.pcss.css b/core/themes/claro/css/components/table--file-multiple-widget.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/table--file-multiple-widget.pcss.css
rename to core/themes/claro/css/components/table--file-multiple-widget.pcss.css
diff --git a/core/themes/claro/css/src/components/tabledrag.css b/core/themes/claro/css/components/tabledrag.css
similarity index 100%
rename from core/themes/claro/css/src/components/tabledrag.css
rename to core/themes/claro/css/components/tabledrag.css
diff --git a/core/themes/claro/css/src/components/tabledrag.pcss.css b/core/themes/claro/css/components/tabledrag.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tabledrag.pcss.css
rename to core/themes/claro/css/components/tabledrag.pcss.css
diff --git a/core/themes/claro/css/src/components/tables.css b/core/themes/claro/css/components/tables.css
similarity index 100%
rename from core/themes/claro/css/src/components/tables.css
rename to core/themes/claro/css/components/tables.css
diff --git a/core/themes/claro/css/src/components/tables.pcss.css b/core/themes/claro/css/components/tables.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tables.pcss.css
rename to core/themes/claro/css/components/tables.pcss.css
diff --git a/core/themes/claro/css/src/components/tableselect.css b/core/themes/claro/css/components/tableselect.css
similarity index 100%
rename from core/themes/claro/css/src/components/tableselect.css
rename to core/themes/claro/css/components/tableselect.css
diff --git a/core/themes/claro/css/src/components/tableselect.pcss.css b/core/themes/claro/css/components/tableselect.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tableselect.pcss.css
rename to core/themes/claro/css/components/tableselect.pcss.css
diff --git a/core/themes/claro/css/src/components/tablesort-indicator.css b/core/themes/claro/css/components/tablesort-indicator.css
similarity index 100%
rename from core/themes/claro/css/src/components/tablesort-indicator.css
rename to core/themes/claro/css/components/tablesort-indicator.css
diff --git a/core/themes/claro/css/src/components/tablesort-indicator.pcss.css b/core/themes/claro/css/components/tablesort-indicator.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tablesort-indicator.pcss.css
rename to core/themes/claro/css/components/tablesort-indicator.pcss.css
diff --git a/core/themes/claro/css/src/components/tabs.css b/core/themes/claro/css/components/tabs.css
similarity index 100%
rename from core/themes/claro/css/src/components/tabs.css
rename to core/themes/claro/css/components/tabs.css
diff --git a/core/themes/claro/css/src/components/tabs.pcss.css b/core/themes/claro/css/components/tabs.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tabs.pcss.css
rename to core/themes/claro/css/components/tabs.pcss.css
diff --git a/core/themes/claro/css/src/components/tour.theme.css b/core/themes/claro/css/components/tour.theme.css
similarity index 100%
rename from core/themes/claro/css/src/components/tour.theme.css
rename to core/themes/claro/css/components/tour.theme.css
diff --git a/core/themes/claro/css/src/components/tour.theme.pcss.css b/core/themes/claro/css/components/tour.theme.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/tour.theme.pcss.css
rename to core/themes/claro/css/components/tour.theme.pcss.css
diff --git a/core/themes/claro/css/src/components/vertical-tabs.css b/core/themes/claro/css/components/vertical-tabs.css
similarity index 100%
rename from core/themes/claro/css/src/components/vertical-tabs.css
rename to core/themes/claro/css/components/vertical-tabs.css
diff --git a/core/themes/claro/css/src/components/vertical-tabs.pcss.css b/core/themes/claro/css/components/vertical-tabs.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/vertical-tabs.pcss.css
rename to core/themes/claro/css/components/vertical-tabs.pcss.css
diff --git a/core/themes/claro/css/src/components/views-exposed-form.css b/core/themes/claro/css/components/views-exposed-form.css
similarity index 100%
rename from core/themes/claro/css/src/components/views-exposed-form.css
rename to core/themes/claro/css/components/views-exposed-form.css
diff --git a/core/themes/claro/css/src/components/views-exposed-form.pcss.css b/core/themes/claro/css/components/views-exposed-form.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/views-exposed-form.pcss.css
rename to core/themes/claro/css/components/views-exposed-form.pcss.css
diff --git a/core/themes/claro/css/src/components/views-ui.css b/core/themes/claro/css/components/views-ui.css
similarity index 100%
rename from core/themes/claro/css/src/components/views-ui.css
rename to core/themes/claro/css/components/views-ui.css
diff --git a/core/themes/claro/css/src/components/views-ui.pcss.css b/core/themes/claro/css/components/views-ui.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/components/views-ui.pcss.css
rename to core/themes/claro/css/components/views-ui.pcss.css
diff --git a/core/themes/claro/css/src/layout/breadcrumb.css b/core/themes/claro/css/layout/breadcrumb.css
similarity index 100%
rename from core/themes/claro/css/src/layout/breadcrumb.css
rename to core/themes/claro/css/layout/breadcrumb.css
diff --git a/core/themes/claro/css/src/layout/breadcrumb.pcss.css b/core/themes/claro/css/layout/breadcrumb.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/breadcrumb.pcss.css
rename to core/themes/claro/css/layout/breadcrumb.pcss.css
diff --git a/core/themes/claro/css/src/layout/card-list.css b/core/themes/claro/css/layout/card-list.css
similarity index 100%
rename from core/themes/claro/css/src/layout/card-list.css
rename to core/themes/claro/css/layout/card-list.css
diff --git a/core/themes/claro/css/src/layout/card-list.pcss.css b/core/themes/claro/css/layout/card-list.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/card-list.pcss.css
rename to core/themes/claro/css/layout/card-list.pcss.css
diff --git a/core/themes/claro/css/src/layout/image-widget.css b/core/themes/claro/css/layout/image-widget.css
similarity index 100%
rename from core/themes/claro/css/src/layout/image-widget.css
rename to core/themes/claro/css/layout/image-widget.css
diff --git a/core/themes/claro/css/src/layout/image-widget.pcss.css b/core/themes/claro/css/layout/image-widget.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/image-widget.pcss.css
rename to core/themes/claro/css/layout/image-widget.pcss.css
diff --git a/core/themes/claro/css/src/layout/layout.css b/core/themes/claro/css/layout/layout.css
similarity index 100%
rename from core/themes/claro/css/src/layout/layout.css
rename to core/themes/claro/css/layout/layout.css
diff --git a/core/themes/claro/css/src/layout/layout.pcss.css b/core/themes/claro/css/layout/layout.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/layout.pcss.css
rename to core/themes/claro/css/layout/layout.pcss.css
diff --git a/core/themes/claro/css/src/layout/local-actions.css b/core/themes/claro/css/layout/local-actions.css
similarity index 100%
rename from core/themes/claro/css/src/layout/local-actions.css
rename to core/themes/claro/css/layout/local-actions.css
diff --git a/core/themes/claro/css/src/layout/local-actions.pcss.css b/core/themes/claro/css/layout/local-actions.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/local-actions.pcss.css
rename to core/themes/claro/css/layout/local-actions.pcss.css
diff --git a/core/themes/claro/css/src/layout/node-add.css b/core/themes/claro/css/layout/node-add.css
similarity index 100%
rename from core/themes/claro/css/src/layout/node-add.css
rename to core/themes/claro/css/layout/node-add.css
diff --git a/core/themes/claro/css/src/layout/node-add.pcss.css b/core/themes/claro/css/layout/node-add.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/node-add.pcss.css
rename to core/themes/claro/css/layout/node-add.pcss.css
diff --git a/core/themes/claro/css/src/layout/system-admin--layout.css b/core/themes/claro/css/layout/system-admin--layout.css
similarity index 100%
rename from core/themes/claro/css/src/layout/system-admin--layout.css
rename to core/themes/claro/css/layout/system-admin--layout.css
diff --git a/core/themes/claro/css/src/layout/system-admin--layout.pcss.css b/core/themes/claro/css/layout/system-admin--layout.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/layout/system-admin--layout.pcss.css
rename to core/themes/claro/css/layout/system-admin--layout.pcss.css
diff --git a/core/themes/claro/css/src/theme/ckeditor-dialog.css b/core/themes/claro/css/theme/ckeditor-dialog.css
similarity index 98%
rename from core/themes/claro/css/src/theme/ckeditor-dialog.css
rename to core/themes/claro/css/theme/ckeditor-dialog.css
index 971968a631..4e54f8ee1e 100644
--- a/core/themes/claro/css/src/theme/ckeditor-dialog.css
+++ b/core/themes/claro/css/theme/ckeditor-dialog.css
@@ -115,7 +115,7 @@
   width: 16px;
   height: 16px;
   opacity: 1;
-  background: url(../../../images/core/ffffff/ex.svg) 0 0 no-repeat;
+  background: url(../../../../misc/icons/ffffff/ex.svg) 0 0 no-repeat;
 }
 
 [dir="rtl"] .cke_reset_all .cke_dialog .cke_dialog_close_button {
@@ -191,7 +191,7 @@
 
 .cke_reset_all select.cke_dialog_ui_input_select {
   padding-right: 1.5em;
-  background: #fcfcfa url(../../../images/core/333333/caret-down.svg) no-repeat 99% 63%;
+  background: #fcfcfa url(../../../../misc/icons/333333/caret-down.svg) no-repeat 99% 63%;
 }
 
 .cke_reset_all .cke_dialog_body textarea:focus,
diff --git a/core/themes/claro/css/src/theme/ckeditor-dialog.pcss.css b/core/themes/claro/css/theme/ckeditor-dialog.pcss.css
similarity index 97%
rename from core/themes/claro/css/src/theme/ckeditor-dialog.pcss.css
rename to core/themes/claro/css/theme/ckeditor-dialog.pcss.css
index 6bf0f54dbb..ca07995c54 100644
--- a/core/themes/claro/css/src/theme/ckeditor-dialog.pcss.css
+++ b/core/themes/claro/css/theme/ckeditor-dialog.pcss.css
@@ -58,7 +58,7 @@
   width: 16px;
   height: 16px;
   opacity: 1;
-  background: url(../../../images/core/ffffff/ex.svg) 0 0 no-repeat;
+  background: url(../../../../misc/icons/ffffff/ex.svg) 0 0 no-repeat;
 }
 [dir="rtl"] .cke_reset_all .cke_dialog .cke_dialog_close_button {
   right: auto;
@@ -116,7 +116,7 @@
 }
 .cke_reset_all select.cke_dialog_ui_input_select {
   padding-right: 1.5em;
-  background: #fcfcfa url(../../../images/core/333333/caret-down.svg) no-repeat 99% 63%;
+  background: #fcfcfa url(../../../../misc/icons/333333/caret-down.svg) no-repeat 99% 63%;
 }
 .cke_reset_all .cke_dialog_body textarea:focus,
 .cke_reset_all .cke_dialog_body input[type="text"]:focus,
diff --git a/core/themes/claro/css/src/theme/ckeditor-editor.css b/core/themes/claro/css/theme/ckeditor-editor.css
similarity index 100%
rename from core/themes/claro/css/src/theme/ckeditor-editor.css
rename to core/themes/claro/css/theme/ckeditor-editor.css
diff --git a/core/themes/claro/css/src/theme/ckeditor-editor.pcss.css b/core/themes/claro/css/theme/ckeditor-editor.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/ckeditor-editor.pcss.css
rename to core/themes/claro/css/theme/ckeditor-editor.pcss.css
diff --git a/core/themes/claro/css/src/theme/ckeditor-frame.css b/core/themes/claro/css/theme/ckeditor-frame.css
similarity index 100%
rename from core/themes/claro/css/src/theme/ckeditor-frame.css
rename to core/themes/claro/css/theme/ckeditor-frame.css
diff --git a/core/themes/claro/css/src/theme/ckeditor-frame.pcss.css b/core/themes/claro/css/theme/ckeditor-frame.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/ckeditor-frame.pcss.css
rename to core/themes/claro/css/theme/ckeditor-frame.pcss.css
diff --git a/core/themes/claro/css/src/theme/colors.css b/core/themes/claro/css/theme/colors.css
similarity index 100%
rename from core/themes/claro/css/src/theme/colors.css
rename to core/themes/claro/css/theme/colors.css
diff --git a/core/themes/claro/css/src/theme/colors.pcss.css b/core/themes/claro/css/theme/colors.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/colors.pcss.css
rename to core/themes/claro/css/theme/colors.pcss.css
diff --git a/core/themes/claro/css/src/theme/field-ui.admin.css b/core/themes/claro/css/theme/field-ui.admin.css
similarity index 100%
rename from core/themes/claro/css/src/theme/field-ui.admin.css
rename to core/themes/claro/css/theme/field-ui.admin.css
diff --git a/core/themes/claro/css/src/theme/field-ui.admin.pcss.css b/core/themes/claro/css/theme/field-ui.admin.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/field-ui.admin.pcss.css
rename to core/themes/claro/css/theme/field-ui.admin.pcss.css
diff --git a/core/themes/claro/css/src/theme/filter.theme.css b/core/themes/claro/css/theme/filter.theme.css
similarity index 100%
rename from core/themes/claro/css/src/theme/filter.theme.css
rename to core/themes/claro/css/theme/filter.theme.css
diff --git a/core/themes/claro/css/src/theme/filter.theme.pcss.css b/core/themes/claro/css/theme/filter.theme.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/filter.theme.pcss.css
rename to core/themes/claro/css/theme/filter.theme.pcss.css
diff --git a/core/themes/claro/css/src/theme/install-page.css b/core/themes/claro/css/theme/install-page.css
similarity index 92%
rename from core/themes/claro/css/src/theme/install-page.css
rename to core/themes/claro/css/theme/install-page.css
index 096e7a821e..8be492a7c3 100644
--- a/core/themes/claro/css/src/theme/install-page.css
+++ b/core/themes/claro/css/theme/install-page.css
@@ -15,13 +15,13 @@
   min-height: 100%;
   background-color: #1275b2;
   background-image:
-    url(../../../images/noise-low.png),
+    url(../../images/noise-low.png),
     -moz-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
   background-image:
-    url(../../../images/noise-low.png),
+    url(../../images/noise-low.png),
     -o-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
   background-image:
-    url(../../../images/noise-low.png),
+    url(../../images/noise-low.png),
     radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
   background-repeat: repeat;
   background-position: left top, 50% 50%; /* LTR */
diff --git a/core/themes/claro/css/src/theme/install-page.pcss.css b/core/themes/claro/css/theme/install-page.pcss.css
similarity index 93%
rename from core/themes/claro/css/src/theme/install-page.pcss.css
rename to core/themes/claro/css/theme/install-page.pcss.css
index 4139a90663..b616b418d9 100644
--- a/core/themes/claro/css/src/theme/install-page.pcss.css
+++ b/core/themes/claro/css/theme/install-page.pcss.css
@@ -9,10 +9,10 @@
   min-height: 100%;
   background-color: #1275b2;
   background-image:
-    url(../../../images/noise-low.png),
+    url(../../images/noise-low.png),
     -webkit-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
   background-image:
-    url(../../../images/noise-low.png),
+    url(../../images/noise-low.png),
     radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
   background-repeat: repeat;
   background-position: left top, 50% 50%; /* LTR */
diff --git a/core/themes/claro/css/src/theme/maintenance-page.css b/core/themes/claro/css/theme/maintenance-page.css
similarity index 100%
rename from core/themes/claro/css/src/theme/maintenance-page.css
rename to core/themes/claro/css/theme/maintenance-page.css
diff --git a/core/themes/claro/css/src/theme/maintenance-page.pcss.css b/core/themes/claro/css/theme/maintenance-page.pcss.css
similarity index 100%
rename from core/themes/claro/css/src/theme/maintenance-page.pcss.css
rename to core/themes/claro/css/theme/maintenance-page.pcss.css
diff --git a/core/themes/claro/css/src/theme/views_ui.admin.theme.css b/core/themes/claro/css/theme/views_ui.admin.theme.css
similarity index 99%
rename from core/themes/claro/css/src/theme/views_ui.admin.theme.css
rename to core/themes/claro/css/theme/views_ui.admin.theme.css
index ba3f8dfe6c..458f0f7d5b 100644
--- a/core/themes/claro/css/src/theme/views_ui.admin.theme.css
+++ b/core/themes/claro/css/theme/views_ui.admin.theme.css
@@ -37,7 +37,7 @@
 
 .views-admin .icon,
 .views-admin .icon-text {
-  background-image: url(../../../images/core/stable/views_ui/sprites.png);
+  background-image: url(../../../stable/images/views_ui/sprites.png);
   background-repeat: no-repeat;
   background-attachment: scroll;
   background-position: left top; /* LTR */
diff --git a/core/themes/claro/css/src/theme/views_ui.admin.theme.pcss.css b/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
similarity index 99%
rename from core/themes/claro/css/src/theme/views_ui.admin.theme.pcss.css
rename to core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
index 88d44d7dd6..087a3633e7 100644
--- a/core/themes/claro/css/src/theme/views_ui.admin.theme.pcss.css
+++ b/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
@@ -25,7 +25,7 @@
 }
 .views-admin .icon,
 .views-admin .icon-text {
-  background-image: url(../../../images/core/stable/views_ui/sprites.png);
+  background-image: url(../../../stable/images/views_ui/sprites.png);
   background-repeat: no-repeat;
   background-attachment: scroll;
   background-position: left top; /* LTR */
diff --git a/core/themes/claro/images/core/0074bd/chevron-left.svg b/core/themes/claro/images/core/0074bd/chevron-left.svg
deleted file mode 100644
index 84119f424c..0000000000
--- a/core/themes/claro/images/core/0074bd/chevron-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7.951 7.645c-.193.196-.193.516 0 .71l3.258 3.29c.193.193.191.519-.002.709l-1.371 1.371c-.193.192-.512.191-.707 0l-5.335-5.371c-.194-.194-.194-.514 0-.708l5.335-5.369c.195-.195.514-.195.707-.001l1.371 1.371c.193.194.195.513.002.709z" fill="#0074bd"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/0074bd/chevron-right.svg b/core/themes/claro/images/core/0074bd/chevron-right.svg
deleted file mode 100644
index 75bd0e733c..0000000000
--- a/core/themes/claro/images/core/0074bd/chevron-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.053 8.355c.193-.195.193-.517 0-.711l-3.26-3.289c-.193-.195-.192-.514.002-.709l1.371-1.371c.194-.194.512-.193.706.001l5.335 5.369c.195.195.195.515 0 .708l-5.335 5.37c-.194.192-.512.193-.706.002l-1.371-1.371c-.194-.195-.195-.514-.002-.709z" fill="#0074bd"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/333333/caret-down.svg b/core/themes/claro/images/core/333333/caret-down.svg
deleted file mode 100644
index 3a16fba3d9..0000000000
--- a/core/themes/claro/images/core/333333/caret-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m3.8 5.4c-.165-.22-.075-.4.2-.4h8.002c.275 0 .365.18.199.4l-3.898 5.2c-.166.221-.436.221-.6 0z" fill="#333"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/73b355/check.svg b/core/themes/claro/images/core/73b355/check.svg
deleted file mode 100644
index 9653fc4a43..0000000000
--- a/core/themes/claro/images/core/73b355/check.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#73b355" height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m6.464 13.676c-.194.194-.513.194-.707 0l-4.96-4.955c-.194-.193-.194-.513 0-.707l1.405-1.407c.194-.195.512-.195.707 0l2.849 2.848c.194.193.513.193.707 0l6.629-6.626c.195-.194.514-.194.707 0l1.404 1.404c.193.194.193.513 0 .707z"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/787878/cog.svg b/core/themes/claro/images/core/787878/cog.svg
deleted file mode 100644
index 4a383118a3..0000000000
--- a/core/themes/claro/images/core/787878/cog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m15.176 9.041c.045-.327.076-.658.076-.998 0-.36-.035-.71-.086-1.056l-2.275-.293c-.115-.426-.283-.827-.498-1.201l1.396-1.808c-.416-.551-.906-1.039-1.459-1.452l-1.807 1.391c-.373-.215-.774-.383-1.2-.499l-.292-2.252c-.338-.048-.677-.081-1.029-.081s-.694.033-1.032.082l-.291 2.251c-.426.116-.826.284-1.2.499l-1.805-1.391c-.552.413-1.044.901-1.459 1.452l1.395 1.808c-.215.374-.383.774-.499 1.2l-2.276.294c-.05.346-.085.696-.085 1.056 0 .34.031.671.077.998l2.285.295c.115.426.284.826.499 1.2l-1.417 1.836c.411.55.896 1.038 1.443 1.452l1.842-1.42c.374.215.774.383 1.2.498l.298 2.311c.337.047.677.08 1.025.08s.688-.033 1.021-.08l.299-2.311c.426-.115.826-.283 1.201-.498l1.842 1.42c.547-.414 1.031-.902 1.443-1.452l-1.416-1.837c.215-.373.383-.773.498-1.199zm-7.174 1.514c-1.406 0-2.543-1.137-2.543-2.541 0-1.402 1.137-2.541 2.543-2.541 1.402 0 2.541 1.138 2.541 2.541 0 1.404-1.139 2.541-2.541 2.541z" fill="#787878"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/787878/key.svg b/core/themes/claro/images/core/787878/key.svg
deleted file mode 100644
index d5e646d1b7..0000000000
--- a/core/themes/claro/images/core/787878/key.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m13.727 7.714c-1.309-1.308-3.248-1.569-4.827-.818l-5.899-5.896h-3.001v2h1v1.618l.378.382h1.622v1h1v1.622h1.622l.864.862-.986 1.016.992.99c-.062 1.162.335 2.346 1.223 3.234 1.66 1.653 4.352 1.653 6.012 0 1.658-1.66 1.658-4.351 0-6.01zm-.829 5.182c-.646.646-1.693.646-2.338 0-.646-.646-.646-1.692 0-2.338.645-.646 1.688-.646 2.338 0 .645.646.645 1.694 0 2.338z" fill="#787878"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/787878/questionmark-disc.svg b/core/themes/claro/images/core/787878/questionmark-disc.svg
deleted file mode 100644
index 48830e960b..0000000000
--- a/core/themes/claro/images/core/787878/questionmark-disc.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.002 1c-3.868 0-7.002 3.134-7.002 7s3.134 7 7.002 7c3.865 0 7-3.134 7-7s-3.135-7-7-7zm3 5c0 .551-.16 1.085-.477 1.586l-.158.22c-.07.093-.189.241-.361.393-.168.148-.35.299-.545.447l-.203.189-.141.129-.096.17-.021.235v.63h-2.001v-.704c.026-.396.078-.73.204-.999.125-.269.271-.498.439-.688l.225-.21-.01-.015.176-.14.137-.128c.186-.139.357-.277.516-.417l.148-.18c.098-.152.168-.323.168-.518 0-.552-.447-1-1-1s-1.002.448-1.002 1h-2c0-1.657 1.343-3 3.002-3 1.656 0 3 1.343 3 3zm-1.75 6.619c0 .344-.281.625-.625.625h-1.25c-.345 0-.626-.281-.626-.625v-1.238c0-.344.281-.625.626-.625h1.25c.344 0 .625.281.625.625z" fill="#787878"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/README.md b/core/themes/claro/images/core/README.md
deleted file mode 100644
index c456c6c0a6..0000000000
--- a/core/themes/claro/images/core/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Purpose of this folder
-Icons in this folder are copied from Drupal core. This folder with its content
-should be removed before moving Claro to Drupal core. See
-https://www.drupal.org/project/claro/issues/3045216 for details.
diff --git a/core/themes/claro/images/core/cccccc/d8-logo.svg b/core/themes/claro/images/core/cccccc/d8-logo.svg
deleted file mode 100644
index e7402fd405..0000000000
--- a/core/themes/claro/images/core/cccccc/d8-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="53.531" viewBox="0 0 47.411 53.531" width="47.411" xmlns="http://www.w3.org/2000/svg"><g fill="#ccc"><circle cx="22.308" cy="41.593" r="8.449"/><path d="m32.813 31.532c2.503 2.614 4.044 6.156 4.044 10.06 0 4.945-2.47 9.31-6.24 11.94 6.97-2.15 12.733-7.388 15.314-13.73 3.57-8.776.247-15.38-5.33-21.37.17.776.264 1.58.264 2.406 0 5.078-3.405 9.36-8.05 10.694z"/><circle cx="29.735" cy="20.838" r="6.463"/><path d="m11.178 50.96c-2.134-2.53-3.42-5.798-3.42-9.368 0-7.448 5.598-13.584 12.814-14.442-1.238-1.794-1.965-3.968-1.965-6.312 0-6.145 4.982-11.128 11.13-11.128.507 0 1.006.037 1.495.103-3.642-3.143-7.275-6.33-10.142-9.813 1.463 15.257-13.898 9.713-19.576 23.773-3.81 9.433-.376 21.095 9.663 27.188z"/></g></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/cccccc/database.svg b/core/themes/claro/images/core/cccccc/database.svg
deleted file mode 100644
index 61c4814f23..0000000000
--- a/core/themes/claro/images/core/cccccc/database.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="44.262" viewBox="0 0 38.847 44.262" width="38.847" xmlns="http://www.w3.org/2000/svg"><g fill="#ccc"><path d="m19.745 0c5.74.123 12.272.953 16.9 4.668 1.865 1.498 2.786 3.91 1.597 6.126-1.255 2.34-4.13 3.733-6.518 4.6-5.63 2.04-12.113 2.38-18.014 1.573-2.92-.4-5.91-1.103-8.58-2.374-2.19-1.04-4.74-2.805-5.093-5.403-.532-3.925 4.23-6.23 7.264-7.3 3.986-1.408 8.239-1.853 12.444-1.89 4.302.092-3.334.03 0 0z"/><path d="m6.76 17.5c3.702 1.427 7.65 1.972 11.6 2.09 4.058.12 8.107-.424 12.023-1.523 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/><path d="m6.76 26.436c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.964c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/><path d="m6.76 35.374c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.134-.626-2.21-.626-3.485v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/></g></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/cccccc/php-logo.svg b/core/themes/claro/images/core/cccccc/php-logo.svg
deleted file mode 100644
index b1a776d858..0000000000
--- a/core/themes/claro/images/core/cccccc/php-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="33.447" viewBox="0 0 66 33.447" width="66" xmlns="http://www.w3.org/2000/svg"><g fill="#ccc"><path d="m49.5 12.255h-2.7l-1.473 7h2.4c1.59 0 2.773-.342 3.55-.94.78-.6 1.304-1.62 1.577-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.498-.51-2.996-.51z"/><path d="m33 0c-18.225 0-33 7.488-33 16.724s14.775 16.724 33 16.724 33-7.488 33-16.724-14.775-16.724-33-16.724zm-9.328 19.982c-.787.737-1.662 1.376-2.625 1.69-.963.313-2.19.583-3.68.583h-3.377l-.935 5h-3.945l3.52-18h7.584c2.28 0 3.946.34 4.992 1.537s1.36 2.74.944 4.885c-.172.884-.462 1.628-.87 2.36-.413.732-.947 1.338-1.608 1.945zm11.51 2.273 1.558-8.124c.177-.91.112-1.29-.196-1.62s-.962-.255-1.963-.255h-3.126l-2.016 10h-3.913l3.52-18h3.912l-.935 5h3.486c2.193 0 3.706.124 4.54.888.832.765 1.08 1.99.748 3.703l-1.637 8.41h-3.977zm21.747-6.708c-.173.884-.463 1.692-.872 2.424-.41.734-.944 1.404-1.605 2.01-.787.738-1.662 1.377-2.625 1.69-.963.314-2.19.584-3.68.584h-3.377l-.934 5h-3.944l3.518-18h7.584c2.282 0 3.946.34 4.992 1.537 1.046 1.2 1.36 2.61.943 4.757z"/><path d="m18.72 12.255h-2.703l-1.473 7h2.4c1.59 0 2.773-.342 3.552-.94.778-.6 1.303-1.62 1.576-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.497-.51-2.996-.51z"/></g></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/e29700/warning.svg b/core/themes/claro/images/core/e29700/warning.svg
deleted file mode 100644
index 5afdac887f..0000000000
--- a/core/themes/claro/images/core/e29700/warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#e29700" height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m14.66 12.316-5.316-10.633c-.738-1.476-1.946-1.476-2.685 0l-5.317 10.633c-.738 1.477.008 2.684 1.658 2.684h10.002c1.65 0 2.396-1.207 1.658-2.684zm-7.66-8.316h2.002v5h-2.002zm2.252 8.615c0 .344-.281.625-.625.625h-1.25c-.345 0-.626-.281-.626-.625v-1.239c0-.344.281-.625.626-.625h1.25c.344 0 .625.281.625.625z"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/e32700/error.svg b/core/themes/claro/images/core/e32700/error.svg
deleted file mode 100644
index 55e304f1f4..0000000000
--- a/core/themes/claro/images/core/e32700/error.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="#e32700" height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8.002 1c-3.868 0-7.002 3.134-7.002 7s3.134 7 7.002 7c3.865 0 7-3.134 7-7s-3.135-7-7-7zm4.025 9.284c.062.063.1.149.1.239 0 .091-.037.177-.1.24l-1.262 1.262c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-2.283-2.283-2.286 2.283c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-1.261-1.262c-.063-.062-.1-.148-.1-.24 0-.088.036-.176.1-.238l2.283-2.285-2.283-2.284c-.063-.064-.1-.15-.1-.24s.036-.176.1-.24l1.262-1.262c.063-.063.149-.1.24-.1.089 0 .176.036.24.1l2.285 2.284 2.283-2.284c.064-.063.15-.1.24-.1s.176.036.24.1l1.262 1.262c.062.063.1.149.1.24 0 .089-.037.176-.1.24l-2.283 2.284z"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/ee0000/required.svg b/core/themes/claro/images/core/ee0000/required.svg
deleted file mode 100644
index 354cf3ac07..0000000000
--- a/core/themes/claro/images/core/ee0000/required.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356" fill="#e00"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/ffffff/ex.svg b/core/themes/claro/images/core/ffffff/ex.svg
deleted file mode 100644
index e2bb45ba55..0000000000
--- a/core/themes/claro/images/core/ffffff/ex.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m3.51 13.925c.194.194.512.195.706.001l3.432-3.431c.194-.194.514-.194.708 0l3.432 3.431c.192.194.514.193.707-.001l1.405-1.417c.191-.195.189-.514-.002-.709l-3.397-3.4c-.192-.193-.192-.514-.002-.708l3.401-3.43c.189-.195.189-.515 0-.709l-1.407-1.418c-.195-.195-.513-.195-.707-.001l-3.43 3.431c-.195.194-.516.194-.708 0l-3.432-3.431c-.195-.195-.512-.194-.706.001l-1.407 1.417c-.194.195-.194.515 0 .71l3.403 3.429c.193.195.193.514-.001.708l-3.4 3.399c-.194.195-.195.516-.001.709l1.406 1.419z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/core/stable/views_ui/sprites.png b/core/themes/claro/images/core/stable/views_ui/sprites.png
deleted file mode 100644
index 751e125690..0000000000
--- a/core/themes/claro/images/core/stable/views_ui/sprites.png
+++ /dev/null
@@ -1,8 +0,0 @@
-�PNG
-
-
IHDR
,���>�IDATx
�An�0E�^�p�Ć5�!��eN�P
�W�DS��R/R�@(K_6V�i�(�6%�������!D*�1�AB��Ao�)������&�5Ɵw��/���@��=(j'�{��v�6�N��5���7��ip�yk8����b�Ġ�bк�_�g]�o�,1�.1�A�19I����TL��;M�.����:�lA8Ǩ���6��,%B�]��ږt��A3���X�<RS'�E�1aǬ�=���fKm�nzW�#�l��%�Ej\�׿D�r��h.Dc��ɜ
-��]� 1�A����p&e?��E�������O ���'��
-�6F뎚ݣ���ǂ%�[�]N��pʒg<_���Ab���n`:a�Mz��-���������$��>�]#6*eߏc�nV�X|���|�dR]�����*X���]
-ѝ"%b�W�����@S�y>��Ne`O�g�W���`�k�x�q�7��V~���2%2�dV>��su��0�Q!:R���g�H�ʷ�����QVs:JĽ�Hٛ��UU��(��(���E�kS�`Q�|-��N���+BQ
-Zp[�)�<�AR���0��u޳�+��@J��g<w�8���
-+�c|p��2+��Qֹ:R`��)P��h��g$D��o�{�y���9%�^Q�����*����EQEQ��S�`rD
86��g۶m۶m/��*l�[�<��Ll�y�?U�>����Bo��^=��D)97P��%���w�Z5,�~��@��+ri��n8ծ�6����WU�E��z�P��5���дc7i�����-�ԟu��n���bwJJJA}}��C������1�������0�>�(���������b�ȝ;wEQ�ҥK�����^ZZڻ���|__�~�)�������}����(((脫����x�f�3�gff`���U�����Zkjj^s8�$&����rǹs�vLNN���ӳC*��`xEF�
��}S�����������;���紵��;���M�3{-`����o����U��ݗ����D��2���x<���M�}���?r�)((lf.[����r\\܋������6000zTl���������;r.]�ʘ�j����]�U��B��_��Z�E���
�*:�S,e�1]�����É]d�8s8�E�W�7�oX}��W�V�	�8"�1�������:�o=�=	t�6�G~�G~�@ �@ �@ P8�*AڮIEND�B`�
\ No newline at end of file
diff --git a/core/themes/claro/images/core/cccccc/clock.svg b/core/themes/claro/images/icons/cccccc/clock.svg
similarity index 100%
rename from core/themes/claro/images/core/cccccc/clock.svg
rename to core/themes/claro/images/icons/cccccc/clock.svg
diff --git a/core/themes/claro/images/icons/cccccc/d8-logo.svg b/core/themes/claro/images/icons/cccccc/d8-logo.svg
new file mode 100644
index 0000000000..035119bc76
--- /dev/null
+++ b/core/themes/claro/images/icons/cccccc/d8-logo.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="47.411" height="53.531" viewBox="0 0 47.411 53.531">
+  <circle fill="#CCC" cx="22.308" cy="41.593" r="8.449"/>
+  <path fill="#CCC" d="M32.813 31.532c2.503 2.614 4.044 6.156 4.044 10.06 0 4.945-2.47 9.31-6.24 11.94 6.97-2.15 12.733-7.388 15.314-13.73 3.57-8.776.247-15.38-5.33-21.37.17.776.264 1.58.264 2.406 0 5.078-3.405 9.36-8.05 10.694z"/>
+  <circle fill="#CCC" cx="29.735" cy="20.838" r="6.463"/>
+  <path fill="#CCC" d="M11.178 50.96c-2.134-2.53-3.42-5.798-3.42-9.368 0-7.448 5.598-13.584 12.814-14.442-1.238-1.794-1.965-3.968-1.965-6.312 0-6.145 4.982-11.128 11.13-11.128.507 0 1.006.037 1.495.103C27.59 6.67 23.957 3.483 21.09 0 22.553 15.257 7.192 9.713 1.514 23.773c-3.81 9.433-.376 21.095 9.663 27.188z"/>
+</svg>
diff --git a/core/themes/claro/images/icons/cccccc/database.svg b/core/themes/claro/images/icons/cccccc/database.svg
new file mode 100644
index 0000000000..3351212de7
--- /dev/null
+++ b/core/themes/claro/images/icons/cccccc/database.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="38.847" height="44.262" viewBox="0 0 38.847 44.262">
+  <path fill="#CCC" d="M19.745 0c5.74.123 12.272.953 16.9 4.668 1.865 1.498 2.786 3.91 1.597 6.126-1.255 2.34-4.13 3.733-6.518 4.6-5.63 2.04-12.113 2.38-18.014 1.573-2.92-.4-5.91-1.103-8.58-2.374C2.94 13.553.39 11.788.037 9.19c-.532-3.925 4.23-6.23 7.264-7.3C11.287.482 15.54.037 19.745 0c4.302.092-3.334.03 0 0z"/>
+  <path fill="#CCC" d="M6.76 17.5c3.702 1.427 7.65 1.972 11.6 2.09 4.058.12 8.107-.424 12.023-1.523 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+  <path fill="#CCC" d="M6.76 26.436c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.964c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+  <path fill="#CCC" d="M6.76 35.374c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.134-.626-2.21-.626-3.485v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+</svg>
diff --git a/core/themes/claro/images/icons/cccccc/php-logo.svg b/core/themes/claro/images/icons/cccccc/php-logo.svg
new file mode 100644
index 0000000000..b039d24288
--- /dev/null
+++ b/core/themes/claro/images/icons/cccccc/php-logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="66" height="33.447" viewBox="0 0 66 33.447">
+  <g fill="#CCC">
+    <path d="M49.5 12.255h-2.7l-1.473 7h2.4c1.59 0 2.773-.342 3.55-.94.78-.6 1.304-1.62 1.577-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.498-.51-2.996-.51z"/>
+    <path d="M33 0C14.775 0 0 7.488 0 16.724s14.775 16.724 33 16.724 33-7.488 33-16.724S51.225 0 33 0zm-9.328 19.982c-.787.737-1.662 1.376-2.625 1.69-.963.313-2.19.583-3.68.583H13.99l-.935 5H9.11l3.52-18h7.584c2.28 0 3.946.34 4.992 1.537 1.046 1.197 1.36 2.74.944 4.885-.172.884-.462 1.628-.87 2.36-.413.732-.947 1.338-1.608 1.945zm11.51 2.273l1.558-8.124c.177-.91.112-1.29-.196-1.62-.308-.33-.962-.255-1.963-.255h-3.126l-2.016 10h-3.913l3.52-18h3.912l-.935 5h3.486c2.193 0 3.706.124 4.54.888.832.765 1.08 1.99.748 3.703l-1.637 8.41h-3.977zm21.747-6.708c-.173.884-.463 1.692-.872 2.424-.41.734-.944 1.404-1.605 2.01-.787.738-1.662 1.377-2.625 1.69-.963.314-2.19.584-3.68.584h-3.377l-.934 5h-3.944l3.518-18h7.584c2.282 0 3.946.34 4.992 1.537 1.046 1.2 1.36 2.61.943 4.757z"/>
+    <path d="M18.72 12.255h-2.703l-1.473 7h2.4c1.59 0 2.773-.342 3.552-.94.778-.6 1.303-1.62 1.576-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.497-.51-2.996-.51z"/>
+  </g>
+</svg>
diff --git a/core/themes/claro/images/core/cccccc/server.svg b/core/themes/claro/images/icons/cccccc/server.svg
similarity index 100%
rename from core/themes/claro/images/core/cccccc/server.svg
rename to core/themes/claro/images/icons/cccccc/server.svg