diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index b45e61295e..8c9fcaeec6 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -67,12 +67,12 @@
 				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
 			<!-- ENDIF -->
 
-			{L_FONT_SIZE}: <select 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>
+			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+				<option value="50">{L_FONT_TINY}</option>
+				<option value="85">{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>
 		<!-- IF .custom_tags -->
 			<br /><br />
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 37fb419e9d..ebd587f16d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -193,6 +193,8 @@ p a {
 		<li>[Feature] Constant PHPBB_ADMIN_PATH introduced, having the same purpose as PHPBB_ROOT_PATH, but for the ACP.</li>
 		<li>[Fix] Further fixing user profile view (please do not forget to update/refresh your template and style) (Bug #14230)</li>
 		<li>[Fix] Adjust google adsense bot information (Bug #14296)</li>
+		<li>[Fix] Fix horizontal scrollbar problem in IE6 (Bug #14228) - fix provided by Danny-dev</li>
+		<li>[Fix] Use correct size values in ACP user signature screen (Bug #13367)</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index 090782091e..b3e79e17a9 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -10,7 +10,7 @@ If you want to view the topic, click the following link:
 {U_TOPIC}
 
 If you want to view the forum, click the following link:
-{U_TOPIC}
+{U_FORUM}
 
 If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 6f7b273efe..35514443a6 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -44,7 +44,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
 	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
 	'BBCODE_E_HELP'				=> 'List: Add list element',
-	'BBCODE_F_HELP'				=> 'Font size: [size=x-small]small text[/size]',
+	'BBCODE_F_HELP'				=> 'Font size: [size=85]small text[/size]',
 	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
 	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
 	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 56f8cdf709..768f2356f7 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -107,7 +107,7 @@
 	<!-- IF S_BBCODE_FLASH -->
 		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
 	<!-- ENDIF -->
-	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}">
+	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
 		<option value="85">{L_FONT_SMALL}</option>
 		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index 151a3f04d2..4d008564c4 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -39,9 +39,9 @@
 			<!-- BEGIN folder -->
 				<!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF -->
 				<!-- IF folder.S_CUR_FOLDER -->
-					<li id="active-subsection"><a href="ucp.php{SID}&amp;i=pm&amp;folder={folder.FOLDER_ID}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li>
+					<li id="active-subsection"><a href="{folder.U_FOLDER}"><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></a></li>
 				<!-- ELSE -->
-					<li><a href="ucp.php{SID}&amp;i=pm&amp;folder={folder.FOLDER_ID}"><span><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></span></a></li>
+					<li><a href="{folder.U_FOLDER}"><span><!-- IF folder.UNREAD_MESSAGES > 0 --><strong>{folder.FOLDER_NAME} ({folder.UNREAD_MESSAGES})</strong><!-- ELSE -->{folder.FOLDER_NAME}<!-- ENDIF --></span></a></li>
 				<!-- ENDIF -->
 				<!-- IF folder.S_LAST_ROW --></ul><!-- ENDIF -->
 			<!-- END folder -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 5e836534a3..178805a484 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -719,8 +719,4 @@
 * tweaks.css
 */
 
-* html .rtl #search-box {
-	margin-left: 35px;
-	margin-right: 0;
-}
 
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 704e5ad61f..2f92f91fc8 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -56,7 +56,7 @@ dl.icon {
 }
 
 * html #search-box {
-	margin-right: 35px;
+	width: 25%;
 }
 
 /* Correctly clear floating for details on profile view */
diff --git a/phpBB/styles/subsilver2/template/search_body.html b/phpBB/styles/subsilver2/template/search_body.html
index 82cb691c10..e66bfd9f1e 100644
--- a/phpBB/styles/subsilver2/template/search_body.html
+++ b/phpBB/styles/subsilver2/template/search_body.html
@@ -61,10 +61,6 @@
 			<td class="genmed" style="padding: 4px;" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
 			<td class="genmed" style="padding: 4px;" width="30%" align="center">{recentsearch.TIME}</td>
 		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row1" colspan="2" align="center"><span class="genmed">{L_NO_RECENT_SEARCHES}</span></td>
-		</tr>
 	<!-- END recentsearch -->
 	</table>
 
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index b4c58834b2..b6c9e8d437 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -148,6 +148,7 @@
 		</table>
 	<!-- ENDIF -->
 
+	<!-- IF S_IS_POSTABLE or .topicrow -->
 		<table class="tablebg" width="100%" cellspacing="1">
 		<tr>
 			<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">
@@ -235,6 +236,7 @@
 				</td>
 		</tr>
 		</table>
+	<!-- ENDIF -->
 
 	<!-- IF S_DISPLAY_POST_INFO or TOTAL_TOPICS -->
 		<table width="100%" cellspacing="1">