diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css
index 68d2e05a2c..0e88075efc 100644
--- a/phpBB/templates/subSilver/subSilver.css
+++ b/phpBB/templates/subSilver/subSilver.css
@@ -260,25 +260,25 @@ span.hilit {
 /* Location, number of posts, post date etc */
 .postdetails {
 	color: black;
-	font-size: 65%;
+	font-size: 60%;
 }
 
 /* The content of the posts (body of text) */
 .postbody {
-	font-size: 80%;
+	font-size: 75%;
 }
 
 /* Quote & Code blocks */
 .code {
 	color:	#006600;
-	font:	normal 80% 'Courier New', monospace;
+	font:	normal 70% 'Courier New', monospace;
 	border: #D1D7DC 1px solid;
 	background-color: #FAFAFA;
 }
 
 .quote {
 	color: #444;
-	font: normal 80%/125% Verdana, Arial, Helvetica, sans-serif;
+	font: normal 70%/125% Verdana, Arial, Helvetica, sans-serif;
 	border: #D1D7DC solid 1px;
 	background-color: #FAFAFA; 
 }
diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html
index 6ba74bf43e..f6bb84430f 100644
--- a/phpBB/templates/subSilver/viewtopic_body.html
+++ b/phpBB/templates/subSilver/viewtopic_body.html
@@ -27,41 +27,21 @@
 			</tr>
 		</table></td>
 	</tr>
-	<!-- IF S_HAS_POLL_OPTIONS -->
+	<!-- IF S_HAS_POLL -->
 	<tr>
 		<td class="row2" colspan="2"><br clear="all" /><form method="post" action="{S_POLL_ACTION}"><table cellspacing="0" cellpadding="4" border="0" align="center">
 			<tr>
-				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_MAX_VOTES}</span></td>
-			</tr>
-			<tr>
-				<td align="center"><table cellspacing="0" cellpadding="2" border="0">
-					<!-- BEGIN poll_option -->
-					<tr>
-						<td><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" /><!-- ELSE --><input type="radio" name="vote_id[]" value="{poll_option.POLL_OPTION_ID}" /><!-- ENDIF -->&nbsp;</td>
-						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
-					</tr>
-					<!-- END poll_option -->
-				</table></td>
-			</tr>
-			<tr>
-				<td align="center"><input type="submit" name="castvote" value="{L_SUBMIT_VOTE}" class="liteoption" /></td>
-			</tr>
-			<tr>
-				<td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></b></span></td>
-			</tr>
-		</table>{S_HIDDEN_FIELDS}</form></td>
-	</tr>
-	<!-- ELSEIF S_HAS_POLL_DISPLAY -->
-	<tr>
-		<td class="row2" colspan="2"><br clear="all" /><table cellspacing="0" cellpadding="4" border="0" align="center">
-			<tr>
-				<td colspan="4" align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td>
+				<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span><br /><span class="gensmall">{L_POLL_LENGTH}</span></td>
 			</tr>
 			<tr>
 				<td align="center"><table cellspacing="0" cellpadding="2" border="0">
 					<!-- 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>
+						<!-- ENDIF -->
 						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
+						<!-- IF S_DISPLAY_RESULTS -->
 						<td><table cellspacing="0" cellpadding="0" border="0">
 							<tr>
 								<td>{POLL_LEFT_CAP_IMG}</td>
@@ -74,14 +54,26 @@
 						<!-- IF poll_option.POLL_OPTION_VOTED -->
 						<td class="gensmall" valign="top"><b title="{L_POLL_VOTED_OPTION}">x</b></td>
 						<!-- ENDIF -->
+						<!-- ENDIF -->
 					</tr>
 					<!-- END poll_option -->
 				</table></td>
 			</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="liteoption" /></td>
+			</tr>
+			<!-- ENDIF -->
+			<!-- IF S_DISPLAY_RESULTS -->
 			<tr>
 				<td class="gensmall" colspan="4" align="center"><b>{L_TOTAL_VOTES} : {TOTAL_VOTES}</b></td>
 			</tr>
-		</table><br clear="all" /></td>
+			<!-- ELSE -->
+			<tr>
+				<td align="center"><span class="gensmall"><b><a href="{U_VIEW_RESULTS}">{L_VIEW_RESULTS}</a></b></span></td>
+			</tr>
+			<!-- ENDIF -->
+		</table>{S_HIDDEN_FIELDS}</form></td>
 	</tr>
 	<!-- ENDIF -->
 	<tr>
@@ -99,43 +91,50 @@
 	<!-- ELSEIF postrow.S_WRONG_ENCODING  -->
 		<td colspan="2" height="25" align="center"><span class="gensmall">{postrow.L_IGNORE_POST}</span></td>
 	<!-- ELSE -->
-		<td width="150" align="left" valign="top"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br /></td>
-		<td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+		<td rowspan="2" width="150" align="left" valign="top"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br /></td>
+		<td width="100%" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td width="100%">{postrow.POST_ICON} <a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}&nbsp; &nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
-				<td valign="top" align="right" nowrap="nowrap">{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td>
-			</tr>
-			<tr>
-				<td colspan="2"><hr /></td>
+				<td>{postrow.POST_ICON}&nbsp;</td>
+				<td class="gensmall" width="100%" valign="middle"><b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</td>
+				<td valign="top" nowrap="nowrap">{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td>
 			</tr>
+		</table></td>
+	</tr>
+	<!-- IF postrow.S_ROW_COUNT is even -->
+	<tr class="row1">
+	<!-- ELSE -->
+	<tr class="row2">
+	<!-- ENDIF -->
+		<td><table width="100%" cellspacing="0" cellpadding="5" border="0">
 			<!-- IF postrow.S_POST_UNAPPROVED -->
 			<tr>
-				<td colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr align="left" valign="middle">
 						<td>{UNAPPROVED_IMG}</td>
 						<td class="gensmall" width="100%">&nbsp;{L_POST_NOT_BEEN_APPROVED}&nbsp;[ <a href="{postrow.U_MCP_APPROVE}">{L_APPROVE_POST}</a> ]</td>
 					</tr>
 				</table></td>
 			</tr>
-			<tr>
-				<td colspan="2"><hr /></td>
-			</tr>
 			<!-- ENDIF -->
 			<!-- IF postrow.S_POST_REPORTED -->
 			<tr>
-				<td colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr align="left" valign="middle">
 						<td>{REPORTED_IMG}</td>
 						<td class="gensmall" width="100%">&nbsp;{L_POST_BEEN_REPORTED}&nbsp;[ <a href="{postrow.U_MCP_REPORT}">{L_READ_REPORTS}</a> ]</td>
 					</tr>
 				</table></td>
 			</tr>
-			<tr>
-				<td colspan="2"><hr /></td>
-			</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td colspan="2"><span class="postbody">{postrow.MESSAGE}</span><!-- IF postrow.S_HAS_ATTACHMENTS --><!-- INCLUDE viewtopic_attach_body.html --><!-- ENDIF --><!-- IF postrow.SIGNATURE --><span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span><!-- ENDIF --><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
+				<td height="100" valign="top"><table width="100%" cellspacing="0" cellpadding="2">
+					<tr>
+						<td><span class="postbody">{postrow.MESSAGE}</span><!-- IF postrow.S_HAS_ATTACHMENTS --><!-- INCLUDE viewtopic_attach_body.html --><!-- ENDIF --><!-- IF postrow.SIGNATURE --><span class="postbody"><br />_________________<br />{postrow.SIGNATURE}</span><!-- ENDIF --><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
+					</tr>
+				</table></td>
+			</tr>
+			<tr>
+				<td align="right" valign="bottom"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="gensmall"><b>{L_POSTED}:</b> {postrow.POST_DATE}</td>
 			</tr>
 		</table></td>
 	</tr>