diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index 162db9f..fe7925a 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -77,7 +77,7 @@ label[for] {
   background-color: #fcf4f2;
 }
 .form-required:after {
-  background-image: url(../../images/required.svg);
+  background-image: url(../../../core/misc/icons/ee0000/required.svg);
   background-size: 7px 7px;
   width: 7px;
   height: 7px;
diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml
index 9ac9590..d097436 100644
--- a/core/themes/seven/seven.libraries.yml
+++ b/core/themes/seven/seven.libraries.yml
@@ -32,6 +32,7 @@ global-styling:
       css/components/tour.theme.css: {}
       css/components/update-status.css: {}
       css/components/views-ui.css: {}
+      css/components/tablesort-indicator.css: {}
     layout:
       css/layout/layout.css: {}
     theme:
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 621cf82..872ca41 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -110,18 +110,6 @@ function seven_preprocess_admin_block_content(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_HOOK() for tablesort indicator templates.
- *
- * Uses Seven's image versions, so the arrows show up as black and not gray on
- * gray.
- */
-function seven_preprocess_tablesort_indicator(&$variables) {
-  $theme_path = drupal_get_path('theme', 'seven');
-  $variables['arrow_asc'] = file_create_url($theme_path . '/images/arrow-asc.png');
-  $variables['arrow_desc'] = file_create_url($theme_path . '/images/arrow-desc.png');
-}
-
-/**
  * Implements hook_preprocess_HOOK() for menu-local-action templates.
  */
 function seven_preprocess_menu_local_action(array &$variables) {
diff --git a/core/themes/seven/templates/tablesort-indicator.html.twig b/core/themes/seven/templates/tablesort-indicator.html.twig
index b2eadaa..32b41c1 100644
--- a/core/themes/seven/templates/tablesort-indicator.html.twig
+++ b/core/themes/seven/templates/tablesort-indicator.html.twig
@@ -10,7 +10,7 @@
  */
 #}
 {% if style == 'asc' -%}
-  <img src="{{ arrow_asc }}" width="9" height="5" alt="{{ 'Sort ascending'|t }}" title="{{ 'Sort ascending'|t }}" />
+  <span {{attributes.addClass('tablesort tablesort--asc') }}></span>
 {% else -%}
-  <img src="{{ arrow_desc }}" width="9" height="5" alt="{{ 'Sort descending'|t }}" title="{{ 'Sort descending'|t }}" />
+  <span {{attributes.addClass('tablesort tablesort--dsc') }}></span>
 {% endif %}