diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 8bc0b5fdc2..af957ed372 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -50,7 +50,7 @@
 	<fieldset>
 		<legend>{{ lang('APPEARANCE') }}</legend>
 	<dl>
-		<dt><label for="bbcode_font_icon">{{ lang('BBCODE_FONT_ICON') }}</label><br /><span>{{ lang('BBCODE_FONT_ICON_EXPLAIN') }}</span></dt>
+		<dt><label for="bbcode_font_icon">{{ lang('BBCODE_FONT_ICON') }}</label><br /><span>{L_BBCODE_FONT_ICON_EXPLAIN}</span></dt>
 		<dd>
 			<input type="text" name="bbcode_font_icon" id="bbcode_font_icon" value="{{ BBCODE_FONT_ICON }}" />
 			{{ Icon('font', BBCODE_FONT_ICON, '', false, '', {'id':'bbcode_icon_preview'}) }}
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 66ef3627ab..e28c1f6155 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -104,12 +104,13 @@ class acp_bbcodes
 					'U_BACK'			=> $this->u_action,
 					'U_ACTION'			=> $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : ''),
 
-					'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
-					'BBCODE_MATCH'			=> $bbcode_match,
-					'BBCODE_TPL'			=> $bbcode_tpl,
-					'BBCODE_HELPLINE'		=> $bbcode_helpline,
-					'BBCODE_FONT_ICON'		=> $bbcode_font_icon,
-					'DISPLAY_ON_POSTING'	=> $display_on_posting,
+					'L_BBCODE_USAGE_EXPLAIN'		=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'),
+					'L_BBCODE_FONT_ICON_EXPLAIN'	=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="https://fontawesome.com/v6/icons/" target="_blank">', '</a>'),
+					'BBCODE_MATCH'					=> $bbcode_match,
+					'BBCODE_TPL'					=> $bbcode_tpl,
+					'BBCODE_HELPLINE'				=> $bbcode_helpline,
+					'BBCODE_FONT_ICON'				=> $bbcode_font_icon,
+					'DISPLAY_ON_POSTING'			=> $display_on_posting,
 				);
 
 				$bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR');
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index c219b1a46a..b03a83956f 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
 	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
 	'BBCODE_FONT_ICON'			=> 'BBCode icon',
-	'BBCODE_FONT_ICON_EXPLAIN'	=> 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. <a href="https://fontawesome.com/v6/icons/" target="_blank">Click here</a> to view the list of available icons.',
+	'BBCODE_FONT_ICON_EXPLAIN'	=> 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.',
 	'BBCODE_FONT_ICON_TOO_LONG'	=> 'The icon name you have entered is too long.',
 
 	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
diff --git a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php
index 1a580dde8c..183b5d91db 100644
--- a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php
+++ b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php
@@ -32,7 +32,7 @@ class add_bbcode_font_icon extends \phpbb\db\migration\migration
 		return [
 			'add_columns'	=> [
 				$this->table_prefix . 'bbcodes'	=> [
-					'bbcode_font_icon'	=> ['VCHAR:50', ''],
+					'bbcode_font_icon'	=> ['VCHAR:64', ''],
 				],
 			],
 		];