diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index a893935dbd..1cc724cd62 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -158,7 +158,7 @@ class acp_board
 						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int',	'type' => 'text:4:6', 'explain' => true),
 						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int',	'type' => 'text:4:4', 'explain' => true),
 						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int',	'type' => 'text:5:4', 'explain' => true),
-						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
 						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int',	'type' => 'text:4:4', 'explain' => true),
 						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
@@ -181,7 +181,7 @@ class acp_board
 						'legend2'				=> 'GENERAL_SETTINGS',
 						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int',	'type' => 'text:5:4', 'explain' => true),
 						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
 						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int',	'type' => 'text:5:4', 'explain' => true),
 						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index ef0e80d184..e2d8b7cde4 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -392,7 +392,7 @@ class bbcode
 				'u_open'	=> '<span style="text-decoration: underline">',
 				'u_close'	=> '</span>',
 				'img'		=> '<img src="$1" alt="' . $user->lang['IMAGE'] . '" />',
-				'size'		=> '<span style="font-size: $1px; line-height: normal">$2</span>',
+				'size'		=> '<span style="font-size: $1%; line-height: normal">$2</span>',
 				'color'		=> '<span style="color: $1">$2</span>',
 				'email'		=> '<a href="mailto:$1">$2</a>'
 			);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 319e16fb91..bdb603764c 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -148,7 +148,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars', '
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars', '30');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_font_size', '24');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_font_size', '200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_height', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0');
@@ -156,7 +156,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_urls', '0
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth', '3');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts', '5');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars', '255');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_font_size', '24');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_font_size', '200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_height', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0');
diff --git a/phpBB/styles/subSilver/template/bbcode.html b/phpBB/styles/subSilver/template/bbcode.html
index 1f0e8a72d2..fe7ea4fa5d 100644
--- a/phpBB/styles/subSilver/template/bbcode.html
+++ b/phpBB/styles/subSilver/template/bbcode.html
@@ -48,7 +48,7 @@
 
 <!-- BEGIN color --><span style="color: {COLOR}">{TEXT}</span><!-- END color -->
 
-<!-- BEGIN size --><span style="font-size: {SIZE}px; line-height: normal">{TEXT}</span><!-- END size -->
+<!-- BEGIN size --><span style="font-size: {SIZE}em; line-height: normal">{TEXT}</span><!-- END size -->
 
 <!-- BEGIN img --><img src="{URL}" alt="{L_IMAGE}" /><!-- END img -->
 
diff --git a/phpBB/styles/subSilver/template/posting_buttons.html b/phpBB/styles/subSilver/template/posting_buttons.html
index 28124a9ee6..110feafe80 100644
--- a/phpBB/styles/subSilver/template/posting_buttons.html
+++ b/phpBB/styles/subSilver/template/posting_buttons.html
@@ -69,11 +69,11 @@
 			<input type="button" class="btnbbcode" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
 		<!-- ENDIF -->
 		<span class="genmed nowrap">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')" onmouseout="helpline('tip')">
-			<option value="7">{L_FONT_TINY}</option>
-			<option value="9">{L_FONT_SMALL}</option>
-			<option value="12" selected="selected">{L_FONT_NORMAL}</option>
-			<option value="18">{L_FONT_LARGE}</option>
-			<option value="24">{L_FONT_HUGE}</option>
+			<option value="50">{L_FONT_TINY}</option>
+			<option value="80">{L_FONT_SMALL}</option>
+			<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+			<option value="150">{L_FONT_LARGE}</option>
+			<option value="200">{L_FONT_HUGE}</option>
 		</select></span>
 	</td>
 </tr>