diff --git a/phpBB/templates/subSilver/memberlist_body.html b/phpBB/templates/subSilver/memberlist_body.html
index c09b8ef76b..7867fa97c0 100644
--- a/phpBB/templates/subSilver/memberlist_body.html
+++ b/phpBB/templates/subSilver/memberlist_body.html
@@ -33,10 +33,10 @@ function marklist(status)
 
 <form method="post" action="{S_MODE_ACTION}" name="search"><table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
-		<th colspan="2" height="25">{L_SEARCH_USERNAME}</th>
+		<th colspan="2" height="25">{L_FIND_USERNAME}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="2"><span class="gensmall">{L_SEARCH_EXPLAIN}</span></td>
+		<td class="row3" colspan="2"><span class="gensmall">{L_FIND_USERNAME_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 		<td class="row1"><span class="gen">{L_USERNAME}:</span></span></td>
@@ -97,10 +97,10 @@ function marklist(status)
 <table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
 	<tr>
 		<th height="25" nowrap="nowrap">#</th>
-		<th nowrap="nowrap">&nbsp;</th>
+		<th nowrap="nowrap">{L_SEND_MESSAGE}</th>
 		<th nowrap="nowrap">{L_USERNAME}</th>
 		<th nowrap="nowrap">{L_EMAIL}</th>
-		<th nowrap="nowrap">{L_FROM}</th>
+		<th nowrap="nowrap">{L_LOCATION}</th>
 		<th nowrap="nowrap">{L_JOINED}</th>
 		<th nowrap="nowrap">{L_POSTS}</th>
 		<th nowrap="nowrap">{L_WEBSITE}</th>
@@ -124,7 +124,12 @@ function marklist(status)
 	</tr>
 	<!-- END memberrow -->
 	<tr>
-		<td class="cat" colspan="<!-- IF S_SEARCH_USER -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center"><!-- IF S_SEARCH_USER --><input class="liteoption" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span>&nbsp;{S_MODE_SELECT}&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;{S_ORDER_SELECT}&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="liteoption" /><!-- ENDIF --></td>
+		<td class="cat" colspan="<!-- IF S_SEARCH_USER -->9<!-- ELSE -->8<!-- ENDIF -->" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+			<tr>
+				<td align="center"><span class="gensmall">{L_SELECT_SORT_METHOD}:</span>&nbsp;{S_MODE_SELECT}&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;{S_ORDER_SELECT}&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="liteoption" /></td>
+				<!-- IF S_SEARCH_USER --><td align="right"><input class="liteoption" type="submit" value="{L_SELECT_MARKED}" /></td><!-- ENDIF -->
+			</tr>
+		</table></td>
 	</tr>
 </table>
 
diff --git a/phpBB/templates/subSilver/overall_header.html b/phpBB/templates/subSilver/overall_header.html
index ce964f3b33..158be32836 100644
--- a/phpBB/templates/subSilver/overall_header.html
+++ b/phpBB/templates/subSilver/overall_header.html
@@ -42,16 +42,16 @@
 				<td colspan="2"><img src="images/spacer.gif" height="5" alt="" /></td>
 			</tr>
 			<tr>
-				<td height="25" valign="middle" nowrap="nowrap">&nbsp;<span class="mainmenu"><a href="{U_LOGIN_LOGOUT}"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a>&nbsp;<!-- IF S_USER_LOGGED_IN --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a><!-- ELSE --> &nbsp;<a href="{U_REGISTER}"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a><!-- ENDIF --></span></td>
+				<td height="25" valign="middle" nowrap="nowrap"><span class="mainmenu"><a href="{U_LOGIN_LOGOUT}"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a>&nbsp;<!-- IF S_USER_LOGGED_IN --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a><!-- ELSE --> &nbsp;<a href="{U_REGISTER}"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a><!-- ENDIF --></span></td>
 
-				<td height="25" align="right" valign="middle" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a>&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></span>&nbsp;</td>
+				<td height="25" align="right" valign="middle" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a>&nbsp; &nbsp;<a href="{U_SEARCH}"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a><!-- IF S_USER_LOGGED_IN -->&nbsp; &nbsp;<a href="{U_PROFILE}"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a><!-- ENDIF --></span></td>
 			</tr>
 			<tr>
 				<td><img src="images/spacer.gif" height="8" alt="" /></td>
 			</tr>
 			<tr>
 				<td class="gensmall">&nbsp;<!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ENDIF --></td>
-				<td class="gensmall" align="right">{CURRENT_TIME}&nbsp;</td>
+				<td class="gensmall" align="right">{CURRENT_TIME}</td>
 			</tr>
 		</table></td>
 	</tr>
diff --git a/phpBB/templates/subSilver/posting_body.html b/phpBB/templates/subSilver/posting_body.html
index f35bf37118..44705fc8d3 100644
--- a/phpBB/templates/subSilver/posting_body.html
+++ b/phpBB/templates/subSilver/posting_body.html
@@ -115,15 +115,15 @@ function checkForm()
 				<td><input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /></td>
 			</tr>
 			<tr>
-				<td colspan="9"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<td colspan="9"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td><span class="genmed"> &nbsp;{L_FONT_SIZE}:</span> <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')">
-							<option value="7" class="genmed">{L_FONT_TINY}</option>
-							<option value="9" class="genmed">{L_FONT_SMALL}</option>
-							<option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
-							<option value="18" class="genmed">{L_FONT_LARGE}</option>
-							<option  value="24" class="genmed">{L_FONT_HUGE}</option>
-						</select</td>
+							<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>
+						</select></td>
 						<td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span></td>
 					</tr>
 				</table></td>
@@ -133,7 +133,7 @@ function checkForm()
 				<td align="center"><span class="genmed">{L_FONT_COLOR}</span></td>
 			</tr>
 			<tr>
-				<td colspan="9"><textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea></td>
+				<td colspan="9"><textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea></td>
 				<td width="100%" align="center" valign="top"><table cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td bgcolor="black"><script language="javascript" type="text/javascript"><!--
@@ -147,7 +147,7 @@ function checkForm()
 		</table></td>
 	</tr>
 	<tr>
-		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><table cellspacing="2" cellpadding="" border="0">
+		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><table cellspacing="2" cellpadding="0" border="0">
 			<tr>
 				<td><span class="gensmall">{HTML_STATUS}</span></td>
 			</tr>