diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php
index e3300eab80..065364a3e6 100644
--- a/phpBB/phpbb/template/twig/extension/icon.php
+++ b/phpBB/phpbb/template/twig/extension/icon.php
@@ -103,7 +103,7 @@ class icon extends \Twig\Extension\AbstractExtension
 
 		try
 		{
-			return $environment->render("icons/{$type}.html", [
+			return $environment->render("macros/icons/{$type}.html", [
 				'ATTRIBUTES'	=> (string) $this->implode_attributes($attributes),
 				'CLASSES'		=> (string) $classes,
 				'ICON'			=> (string) $icon,
diff --git a/phpBB/styles/prosilver/template/icons/font.html b/phpBB/styles/all/templates/macros/icons/font.html
similarity index 100%
rename from phpBB/styles/prosilver/template/icons/font.html
rename to phpBB/styles/all/templates/macros/icons/font.html
diff --git a/phpBB/styles/prosilver/template/icons/iconify.html b/phpBB/styles/all/templates/macros/icons/iconify.html
similarity index 100%
rename from phpBB/styles/prosilver/template/icons/iconify.html
rename to phpBB/styles/all/templates/macros/icons/iconify.html
diff --git a/phpBB/styles/prosilver/template/icons/png.html b/phpBB/styles/all/templates/macros/icons/png.html
similarity index 100%
rename from phpBB/styles/prosilver/template/icons/png.html
rename to phpBB/styles/all/templates/macros/icons/png.html
diff --git a/phpBB/styles/prosilver/template/icons/svg.html b/phpBB/styles/all/templates/macros/icons/svg.html
similarity index 100%
rename from phpBB/styles/prosilver/template/icons/svg.html
rename to phpBB/styles/all/templates/macros/icons/svg.html
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index a9b2273372..77cfa0ea82 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -109,7 +109,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 
 		$this->template->set_custom_style('tests', [
 			$this->template_path,
-			$phpbb_root_path . 'styles/prosilver/template',
+			$phpbb_root_path . 'styles/all/templates',
 		]);
 	}