--- styles/subsilver2/theme/stylesheet.css	Mon Mar 16 20:11:08 2009
+++ styles/subsilver2/theme/stylesheet.css	Mon Mar 16 18:06:12 2009
@@ -661,6 +661,12 @@
 	white-space: nowrap;
 }
 
+.topic-icon {
+    position: absolute;
+	 margin-left: -7px;
+    margin-top: 8px;	
+}
+
 .username-coloured {
 	font-weight: bold;
 }
\ No newline at end of file

--- styles/subsilver2/template/viewforum_body.html	Mon Mar 16 20:11:07 2009
+++ styles/subsilver2/template/viewforum_body.html	Mon Mar 16 19:31:03 2009
@@ -17,15 +17,11 @@
 <!-- IF S_DISPLAY_ACTIVE -->
 	<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><span class="nav">{L_ACTIVE_TOPICS}</span></td>
+		<td class="cat" colspan="6"><span class="nav">{L_ACTIVE_TOPICS}</span></td>
 	</tr>
 
 	<tr>
-		<!-- IF S_TOPIC_ICONS -->
-			<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
-		<!-- ELSE -->
-			<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
-		<!-- ENDIF -->
+		<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
 		<th>&nbsp;{L_AUTHOR}&nbsp;</th>
 		<th>&nbsp;{L_REPLIES}&nbsp;</th>
 		<th>&nbsp;{L_VIEWS}&nbsp;</th>
@@ -35,10 +31,10 @@
 	<!-- BEGIN topicrow -->
 
 		<tr>
-			<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
-			<!-- ENDIF -->
+			<td class="row1" width="35" align="center">
+				<!-- IF S_TOPIC_ICONS --><span class="topic-icon"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></span><!-- ENDIF -->
+				{topicrow.TOPIC_FOLDER_IMG}
+			</td>
 			<td class="row1">
 				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a>
@@ -66,16 +62,12 @@
 	<!-- BEGINELSE -->
 
 		<tr>
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-			<!-- ELSE -->
-				<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-			<!-- ENDIF -->
+			<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
 		</tr>
 	<!-- END topicrow -->
 
 	<tr align="center">
-		<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">&nbsp;</td>
+		<td class="cat" colspan="6">&nbsp;</td>
 	</tr>
 	</table>
 
@@ -151,7 +143,7 @@
 	<!-- IF not S_DISPLAY_ACTIVE and (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 -->">
+			<td class="cat" colspan="6">
 				<table width="100%" cellspacing="0">
 				<tr class="nav">
 					<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
@@ -162,11 +154,7 @@
 		</tr>
 
 		<tr>
-			<!-- IF S_TOPIC_ICONS -->
-				<th colspan="3">&nbsp;{L_TOPICS}&nbsp;</th>
-			<!-- ELSE -->
-				<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
-			<!-- ENDIF -->
+			<th colspan="2">&nbsp;{L_TOPICS}&nbsp;</th>
 			<th>&nbsp;{L_AUTHOR}&nbsp;</th>
 			<th>&nbsp;{L_REPLIES}&nbsp;</th>
 			<th>&nbsp;{L_VIEWS}&nbsp;</th>
@@ -177,19 +165,19 @@
 
 			<!-- IF topicrow.S_TOPIC_TYPE_SWITCH eq 1 -->
 				<tr>
-					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td>
+					<td class="row3" colspan="6"><b class="gensmall">{L_ANNOUNCEMENTS}</b></td>
 				</tr>
 			<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH eq 0 -->
 				<tr>
-					<td class="row3" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->"><b class="gensmall">{L_TOPICS}</b></td>
+					<td class="row3" colspan="6"><b class="gensmall">{L_TOPICS}</b></td>
 				</tr>
 			<!-- ENDIF -->
 
 			<tr>
-				<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-				<!-- IF S_TOPIC_ICONS -->
-					<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
-				<!-- ENDIF -->
+				<td class="row1" width="35" align="center">
+				    <!-- IF S_TOPIC_ICONS --><span class="topic-icon"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></span><!-- ENDIF -->
+				    {topicrow.TOPIC_FOLDER_IMG}
+				</td>
 				<td class="row1">
 					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
@@ -217,22 +205,14 @@
 		<!-- BEGINELSE -->
 			<!-- IF S_IS_POSTABLE -->
 			<tr>
-				<!-- IF S_TOPIC_ICONS -->
-					<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-				<!-- ELSE -->
-					<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
-				<!-- ENDIF -->
+				<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen"><!-- IF not S_SORT_DAYS -->{L_NO_TOPICS}<!-- ELSE -->{L_NO_TOPICS_TIME_FRAME}<!-- ENDIF --></span></td>
 			</tr>
 			<!-- ENDIF -->
 		<!-- END topicrow -->
 
 		<!-- IF not S_IS_BOT -->
 		<tr align="center">
-			<!-- IF S_TOPIC_ICONS -->
-				<td class="cat" colspan="7">
-			<!-- ELSE -->
 				<td class="cat" colspan="6">
-			<!-- ENDIF -->
 					<form method="post" action="{S_FORUM_ACTION}"><span class="gensmall">{L_DISPLAY_TOPICS}:</span>&nbsp;{S_SELECT_SORT_DAYS}&nbsp;<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}" /></form>
 				</td>
 		</tr>
		
--- styles/subsilver2/template/ucp_pm_viewfolder.html	Mon Mar 16 20:11:06 2009
+++ styles/subsilver2/template/ucp_pm_viewfolder.html	Mon Mar 16 19:34:44 2009
@@ -8,11 +8,7 @@
 
 <div style="padding: 2px;"></div>
 
-<!-- IF S_PM_ICONS -->
-	<!-- DEFINE $COLSPAN = 6 -->
-<!-- ELSE -->
-	<!-- DEFINE $COLSPAN = 5 -->
-<!-- ENDIF -->
+<!-- DEFINE $COLSPAN = 5 -->
 
 <form name="viewfolder" method="post" action="{S_PM_ACTION}" style="margin:0px">
 
@@ -53,7 +49,7 @@
 		</tr>
 	<!-- ENDIF -->
 	<tr>
-		<th colspan="<!-- IF S_PM_ICONS -->3<!-- ELSE -->2<!-- ENDIF -->">&nbsp;{L_SUBJECT}&nbsp;</th>
+		<th colspan="2">&nbsp;{L_SUBJECT}&nbsp;</th>
 		<th>&nbsp;<!-- IF S_SHOW_RECIPIENTS -->{L_RECIPIENTS}<!-- ELSE -->{L_AUTHOR}<!-- ENDIF -->&nbsp;</th>
 		<th>&nbsp;{L_SENT_AT}&nbsp;</th>
 		<th>&nbsp;{L_MARK}&nbsp;</th>
@@ -61,11 +57,10 @@
 
 	<!-- BEGIN messagerow -->
 		<tr>
-			<td class="row1" width="25" align="center" nowrap="nowrap">{messagerow.FOLDER_IMG}</td>
-		<!-- IF S_PM_ICONS -->
-			<td class="row1" width="25" align="center">{messagerow.PM_ICON_IMG}</td>
-		<!-- ENDIF -->
-
+			<td class="row1" width="35" align="center" nowrap="nowrap">
+				<!-- IF S_PM_ICONS --><span class="topic-icon">{messagerow.PM_ICON_IMG}</span><!-- ENDIF -->
+				{messagerow.FOLDER_IMG}
+			</td>
 		<!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF -->
 			<!-- IF not messagerow.PM_IMG and messagerow.PM_CLASS -->
 				<span class="{messagerow.PM_CLASS}" style="float: {S_CONTENT_FLOW_BEGIN};"><img src="images/spacer.gif" width="10" height="10" alt="" /></span>&nbsp;

--- styles/subsilver2/template/search_results.html	Mon Mar 16 20:11:05 2009
+++ styles/subsilver2/template/search_results.html	Mon Mar 16 19:25:08 2009
@@ -19,7 +19,7 @@
 	<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 colspan="1" 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>
@@ -27,11 +27,9 @@
 	</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">
-			<!-- IF searchresults.TOPIC_ICON_IMG -->
-				<img src="{T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}" width="{searchresults.TOPIC_ICON_IMG_WIDTH}" height="{searchresults.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" />
-			<!-- ENDIF -->
+			<td class="row1" width="35" align="center">
+				<!-- IF searchresults.TOPIC_ICON_IMG --><span class="topic-icon"><!-- IF searchresults.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}" width="{searchresults.TOPIC_ICON_IMG_WIDTH}" height="{searchresults.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></span><!-- ENDIF -->
+				{searchresults.TOPIC_FOLDER_IMG}
 			</td>
 			<td class="row1">
 				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->