diff --git a/phpBB/assets/css/all.min.css b/phpBB/assets/css/font-awesome.min.css
similarity index 100%
rename from phpBB/assets/css/all.min.css
rename to phpBB/assets/css/font-awesome.min.css
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0cc8cf6fea..440f868882 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4065,7 +4065,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		'T_STYLESHEET_LINK'		=> "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'],
 		'T_STYLESHEET_LANG_LINK'=> "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'],
 
-		'T_FONT_AWESOME_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/all.min.css?assets_version=" . $config['assets_version'],
+		'T_FONT_AWESOME_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
 		'T_FONT_AWESOME_V4SHIMS_LINK'	=> "{$web_path}assets/css/phpbb-fontawesome-v4-shims.min.css?assets_version=" . $config['assets_version'],
 
 		'T_JQUERY_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.4.1.min.js?assets_version=" . $config['assets_version'],
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 606799877b..a013af2c89 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -89,7 +89,7 @@ function adm_page_header($page_title)
 		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
 		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
 
-		'T_FONT_AWESOME_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$phpbb_root_path}assets/css/all.min.css?assets_version=" . $config['assets_version'],
+		'T_FONT_AWESOME_LINK'			=> !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$phpbb_root_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
 		'T_FONT_AWESOME_V4SHIMS_LINK'	=> "{$phpbb_root_path}assets/css/phpbb-fontawesome-v4-shims.min.css?assets_version=" . $config['assets_version'],
 
 		'T_ASSETS_VERSION'		=> $config['assets_version'],
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index fd9b931b3c..2213c3af9c 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -74,7 +74,7 @@
 			var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
 				$span = $('<span class="fa" style="display:none"></span>').appendTo('body');
 			if ($span.css('fontFamily') !== 'Font Awesome 5 Free' ) {
-				$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/all.min.css" rel="stylesheet">');
+				$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">');
 				$fa_cdn.remove();
 			}
 			$span.remove();
diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index dd9fe7790e..2f75517f8f 100644
--- a/tests/functional/forum_style_test.php
+++ b/tests/functional/forum_style_test.php
@@ -19,13 +19,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
 	public function test_font_awesome_style()
 	{
 		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
-		$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
+		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1');
-		$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
+		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
 
 		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
-		$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
+		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
 	}
 
 	public function test_default_forum_style()