diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html
new file mode 100644
index 0000000000..451b9a2406
--- /dev/null
+++ b/phpBB/styles/subSilver/template/search_results.html
@@ -0,0 +1,120 @@
+<!-- INCLUDE overall_header.html -->
+
+<!-- $Id$ -->
+
+<form method="post" action="{S_SEARCH_ACTION}">
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
+	</tr>
+	<tr>
+		<td class="genmed">{L_SEARCHED_FOR}: <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a><!-- IF IGNORED_WORDS --> {L_IGNORED_TERMS}: <b>{IGNORED_WORDS}</b><!-- ENDIF --></td>
+		<td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="search_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<!-- IF S_SHOW_TOPICS -->
+
+	<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th width="4%" nowrap="nowrap">&nbsp;</th>
+		<th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
+	</tr>
+	<!-- BEGIN searchresults -->
+	<tr valign="middle">
+		<td class="row1" width="25" align="center">{searchresults.TOPIC_FOLDER_IMG}</td>
+		<td class="row1" width="25" align="center">{searchresults.TOPIC_ICON_IMG}</td>
+		<td class="row1">
+			<!-- IF searchresults.S_TOPIC_UNAPPROVED -->
+				<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
+			<!-- ENDIF -->
+			<!-- IF searchresults.S_TOPIC_REPORTED -->
+				<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+			<!-- ENDIF -->
+			<p class="topictitle"> {topicrow.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p>
+			<!-- IF searchresults.PAGINATION -->
+				<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p>
+			<!-- ENDIF -->
+			<p class="gensmall">in <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p>
+		</td>
+		<td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR}</p></td>
+		<td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.REPLIES}</p></td>
+		<td class="row2" width="50" align="center"><p class="topicdetails">{searchresults.VIEWS}</p></td>
+		<td class="row1" width="120" align="center">
+			<p class="topicdetails">{searchresults.LAST_POST_TIME}</p>
+			<p class="topicdetails"><!-- IF searchresults.U_LAST_POST_AUTHOR --><a href="{searchresults.U_LAST_POST_AUTHOR}">{searchresults.LAST_POST_AUTHOR}</a><!-- ELSE -->{searchresults.LAST_POST_AUTHOR}<!-- ENDIF -->
+				<a href="{searchresults.U_LAST_POST}">{searchresults.LAST_POST_IMG}</a>
+			</p>
+		</td>
+	</tr>
+	<!-- END searchresults -->
+	<tr>
+		<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
+	</tr>
+	</table>
+
+<!-- ELSE -->
+
+	<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th width="150" nowrap="nowrap">{L_AUTHOR}</th>
+		<th width="100%" nowrap="nowrap">{L_MESSAGE}</th>
+	</tr>
+	<!-- BEGIN searchresults -->
+	<tr class="row2">
+	<!-- IF searchresults.S_IGNORE_POST -->
+		<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>
+	<!-- ELSE -->
+		<td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a>&nbsp;{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> &nbsp; {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td>
+	</tr>
+	<tr class="row1">
+		<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td>
+		<td height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+			<tr>
+				<td class="gensmall"><div style="float:left">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></div><div style="float:right"><a href="{searchresults.U_VIEW_POST}">{searchresults.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {searchresults.POST_DATE}&nbsp;</div></td>
+			</tr>
+		</table></td>
+	</tr>
+	<tr class="row1">
+		<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td>
+		<td valign="top"><table width="100%" cellspacing="5">
+			<tr>
+				<td class="postbody">{searchresults.MESSAGE}</td>
+			</tr>
+		</table></td>
+	</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td>
+	</tr>
+	<!-- END searchresults -->
+	<tr>
+		<td class="cat" colspan="2" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
+	</tr>
+	</table>
+<!-- ENDIF -->
+
+</form>
+
+<div class="nav" style="float:left">{PAGE_NUMBER}&nbsp;[ {TOTAL_MATCHES} ]</div><div class="nav" style="float:right"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></div>
+
+<br clear="all" /><br />
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
+
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/search_results_posts.html b/phpBB/styles/subSilver/template/search_results_posts.html
deleted file mode 100644
index f1b193aec6..0000000000
--- a/phpBB/styles/subSilver/template/search_results_posts.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- $Id$ -->
-
-
-<form method="post" action="{S_SEARCH_ACTION}">
-
-<table width="100%" cellspacing="1">
-	<tr>
-		<td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
-	</tr>
-	<tr>
-		<td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
-		<td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="search_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th width="150" nowrap="nowrap">{L_AUTHOR}</th>
-		<th width="100%" nowrap="nowrap">{L_MESSAGE}</th>
-	</tr>
-	<!-- BEGIN searchresults -->
-	<tr class="row2">
-	<!-- IF searchresults.S_IGNORE_POST -->
-		<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>
-	<!-- ELSE -->
-		<td colspan="2" height="25"><p class="topictitle"><a name="{searchresults.POST_ID}"></a>&nbsp;{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> &nbsp; {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></p></td>
-	</tr>
-	<tr class="row1">
-		<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td>
-		<td height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<tr>
-				<td class="gensmall"><div style="float:left">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></div><div style="float:right"><a href="{searchresults.U_VIEW_POST}">{searchresults.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {searchresults.POST_DATE}&nbsp;</div></td>
-			</tr>
-		</table></td>
-	</tr>
-	<tr class="row1">
-		<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td>
-		<td valign="top"><table width="100%" cellspacing="5">
-			<tr>
-				<td class="postbody">{searchresults.MESSAGE}</td>
-			</tr>
-		</table></td>
-	</tr>
-	<!-- ENDIF -->
-	<tr>
-		<td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td>
-	</tr>
-	<!-- END searchresults -->
-	<tr>
-		<td class="cat" colspan="2" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-	</tr>
-</table></form>
-
-<div class="nav" style="float:left">{PAGE_NUMBER}&nbsp;[ {TOTAL_TOPICS} ]</div><div class="nav" style="float:right"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></div>
-
-	<br clear="all" /><br />
-
-	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
-		<tr>
-			<td class="row1">
-				<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a></p>
-				<p class="datetime">{S_TIMEZONE}</p>
-			</td>
-		</tr>
-	</table>
-
-<br clear="all" />
-
-<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/search_results_topics.html b/phpBB/styles/subSilver/template/search_results_topics.html
deleted file mode 100644
index 39c24e4b55..0000000000
--- a/phpBB/styles/subSilver/template/search_results_topics.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<!-- $Id$ -->
-
-<form method="post" action="{S_SEARCH_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<table width="100%" cellspacing="1">
-	<tr>
-		<td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
-	</tr>
-	<tr>
-		<td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
-		<td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="search_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<th width="4%" nowrap="nowrap">&nbsp;</th>
-		<th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
-		<th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
-	</tr>
-	<!-- BEGIN searchresults -->
-	<tr valign="middle">
-		<td class="row1" align="center">{searchresults.TOPIC_FOLDER_IMG}</td>
-		<td class="row1" width="25" align="center" valign="middle">{searchresults.TOPIC_ICON_IMG}</td>
-		<td class="row2"><a class="topictitle" href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a><span class="gensmall"><!-- IF topicrow.GOTO_PAGE --><br />{topicrow.GOTO_PAGE}<!-- ENDIF --></span><br /><span class="gensmall">in <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></span></td>
-		<td class="row1" align="center"><span class="topicauthor">{searchresults.TOPIC_AUTHOR}</span></td>
-		<td class="row2" align="center"><span class="topicdetails">{searchresults.TOPIC_REPLIES}</span></td>
-		<td class="row1" align="center"><span class="topicdetails">{searchresults.TOPIC_VIEWS}</span></td>
-		<td class="row2" align="center" nowrap="nowrap"><span class="topicdetails">{searchresults.LAST_POST_TIME}<br />{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}</span></td>
-	</tr>
-	<!-- END searchresults -->
-	<tr>
-		<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
-	</tr>
-</table></form>
-
-<div class="nav" style="float:left">{PAGE_NUMBER}&nbsp;[ {TOTAL_TOPICS} ]</div><div class="nav" style="float:right"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></div>
-
-<br clear="all" /><br />
-
-<table class="tablebg" width="100%" cellspacing="1">
-	<tr>
-		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
-	</tr>
-</table>
-
-<br clear="all" />
-
-<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
-
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file