diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html
index eb51d64834..fa01a9383a 100644
--- a/phpBB/styles/subSilver/template/viewforum_body.html
+++ b/phpBB/styles/subSilver/template/viewforum_body.html
@@ -18,14 +18,14 @@
 	<!-- ENDIF -->
 </table>
 
-<!-- IF S_IS_POSTABLE -->
-<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
+		<!-- IF S_IS_POSTABLE -->
 		<td width="10" align="left" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
-		<td class="nav" width="100%" align="left" valign="middle">&nbsp; <a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
+		<!-- ENDIF -->
+		<td class="nav" width="100%" valign="middle">&nbsp; <a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> -> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></td>
 	</tr>
 </table>
-<!-- ENDIF -->
 
 <!-- IF S_HAS_SUBFORUM -->
 <!-- INCLUDE viewforum_subforum.html -->
diff --git a/phpBB/styles/subSilver/template/viewforum_subforum.html b/phpBB/styles/subSilver/template/viewforum_subforum.html
index 4e1d99ceb7..d74c196ccd 100644
--- a/phpBB/styles/subSilver/template/viewforum_subforum.html
+++ b/phpBB/styles/subSilver/template/viewforum_subforum.html
@@ -20,7 +20,7 @@
 					<td><span class="gensmall">{forumrow.FORUM_DESC}</span></td>
 				</tr>
 			</table></td>
-		<td class="row2" colspan="3" align="center" valign="middle" height="50"><!-- IF forumrow.CLICKS neq '' --><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td>
+		<td class="row2" colspan="3" align="center" valign="middle" height="50"><!-- IF forumrow.CLICKS --><span class="gensmall">{L_REDIRECTS}: {forumrow.CLICKS}</span><!-- ENDIF --></td>
 	</tr>
 	<!-- ELSE -->
 	<tr>
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index 87ca210b5a..18c55b8238 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -2,7 +2,7 @@
 
 <table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
 	<tr>
-		<td align="left" valign="bottom"><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- IF MODERATORS neq '' --><br /><span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span><!-- ENDIF --></td>
+		<td align="left" valign="bottom"><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- IF MODERATORS --><br /><span class="gensmall"><b>{L_MODERATORS}: {MODERATORS}</b></span><!-- ENDIF --></td>
 		<td class="gensmall" align="right" valign="bottom">{MCP}</td>
 	</tr>
 	<tr>
@@ -28,11 +28,11 @@
 		<td class="cat" colspan="2" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
 				<td class="nav" nowrap="nowrap">&nbsp;
-				<!-- IF S_WATCH_TOPIC -->{S_WATCH_TOPIC} | <!-- ENDIF -->
-				<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a> | <!-- ENDIF -->
+				<!-- IF S_WATCH_TOPIC -->{S_WATCH_TOPIC} &bull; <!-- ENDIF -->
+				<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a> &bull; <!-- ENDIF -->
 				<!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- ENDIF -->
 				</td>
-				<td class="nav" align="right" nowrap="nowrap"><a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a> | <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> | <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a>&nbsp;</td>
+				<td class="nav" align="right" nowrap="nowrap"><a href="{U_VIEW_OLDER_TOPIC}">{L_VIEW_PREVIOUS_TOPIC}</a> &bull; <a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <a href="{U_VIEW_NEWER_TOPIC}">{L_VIEW_NEXT_TOPIC}</a>&nbsp;</td>
 			</tr>
 		</table></td>
 	</tr>
@@ -47,7 +47,7 @@
 					<!-- BEGIN poll_option -->
 					<tr>
 						<!-- IF S_CAN_VOTE -->
-						<td><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" <!-- IF poll_option.POLL_OPTION_VOTED -->checked="checked"<!-- ENDIF -->/><!-- ELSE --><input type="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" <!-- IF poll_option.POLL_OPTION_VOTED -->checked="checked"<!-- ENDIF -->/><!-- ENDIF -->&nbsp;</td>
+						<td><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" <!-- IF poll_option.POLL_OPTION_VOTED -->checked="checked"<!-- ENDIF -->/><!-- ELSE --><input type="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" <!-- IF poll_option.POLL_OPTION_VOTED -->checked="checked"<!-- ENDIF --> /><!-- ENDIF -->&nbsp;</td>
 						<!-- ENDIF -->
 						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
 						<!-- IF S_DISPLAY_RESULTS -->
@@ -70,7 +70,7 @@
 			</tr>
 			<!-- IF S_CAN_VOTE -->
 			<tr>
-				<td align="center"><span class="gensmall">{L_MAX_VOTES}</span><br /><br /><input type="submit" name="castvote" value="{L_SUBMIT_VOTE}" class="btnlite" /></td>
+				<td align="center"><span class="gensmall">{L_MAX_VOTES}</span><br /><br /><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="btnlite" /></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF S_DISPLAY_RESULTS -->