diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html
index 09704cded7..e234573fd8 100644
--- a/phpBB/styles/subSilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html
@@ -27,7 +27,7 @@
 		<th colspan="2">{L_USERGROUPS}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
+		<td class="row1" colspan="2"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
 	</tr>
 
 	<tr>
@@ -230,7 +230,7 @@
 		<th colspan="3">{L_USERGROUPS}</th>
 	</tr>
 	<tr>
-		<td class="row3" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
+		<td class="row1" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
 	</tr>
 
 	<tr>
diff --git a/phpBB/styles/subSilver/template/ucp_groups_membership.html b/phpBB/styles/subSilver/template/ucp_groups_membership.html
index 460df7e010..d6cae04d0e 100644
--- a/phpBB/styles/subSilver/template/ucp_groups_membership.html
+++ b/phpBB/styles/subSilver/template/ucp_groups_membership.html
@@ -5,7 +5,7 @@
 	<th colspan="3">{L_USERGROUPS}</th>
 </tr>
 <tr>
-	<td class="row3" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
+	<td class="row1" colspan="3"><span class="genmed">{L_GROUPS_EXPLAIN}</span></td>
 </tr>
 
 <tr>
diff --git a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html
index 4dc7ae1424..7df1d3d5ac 100644
--- a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html
@@ -7,9 +7,11 @@
 <tr>
 	<td class="row1" colspan="5" align="center"><span class="genmed">{L_BOOKMARKS_EXPLAIN}</span></td>
 </tr>
+<!-- IF .topicrow -->
 <tr>
 	<th colspan="5">{L_BOOKMARKS}</th>
 </tr>
+<!-- ENDIF -->
 
 <!-- IF S_NO_DISPLAY_BOOKMARKS -->
 	<tr class="row1">
@@ -48,13 +50,15 @@
 		</tr>
 	<!-- END topicrow -->
 
-	<tr>
-		<td class="cat" colspan="5" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" />&nbsp;</td>
-	</tr>
-<!-- ENDIF -->
+		<!-- IF .topicrow -->
+			<tr>
+				<td class="cat" colspan="5" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" />&nbsp;</td>
+			</tr>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
 </table>
 
-<!-- IF not S_NO_DISPLAY_BOOKMARKS -->
+<!-- IF not S_NO_DISPLAY_BOOKMARKS and .topicrow -->
 	<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 't', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 't', false); return false;">{L_UNMARK_ALL}</a></b></div>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/subSilver/template/ucp_main_drafts.html b/phpBB/styles/subSilver/template/ucp_main_drafts.html
index 146a4fed16..05749efabe 100644
--- a/phpBB/styles/subSilver/template/ucp_main_drafts.html
+++ b/phpBB/styles/subSilver/template/ucp_main_drafts.html
@@ -5,7 +5,7 @@
 	<th colspan="4">{L_UCP}</th>
 </tr>
 <tr>
-	<td class="row3" colspan="4" align="center"><span class="genmed">{L_DRAFTS_EXPLAIN}</span></td>
+	<td class="row1" colspan="4" align="center"><span class="genmed">{L_DRAFTS_EXPLAIN}</span></td>
 </tr>
 
 <!-- IF ERROR -->
@@ -42,7 +42,7 @@
 	</tr>
 	<!-- BEGINELSE -->
 		<tr>
-			<td class="row1" colspan="4" height="25" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td>
+			<td class="row1" colspan="4" align="center"><b class="genmed">{L_NO_SAVED_DRAFTS}</b></td>
 		</tr>
 	<!-- END draftrow -->
 
diff --git a/phpBB/styles/subSilver/template/ucp_main_subscribed.html b/phpBB/styles/subSilver/template/ucp_main_subscribed.html
index 1eb5666aae..009ae928dd 100644
--- a/phpBB/styles/subSilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/subSilver/template/ucp_main_subscribed.html
@@ -67,11 +67,14 @@
 	</tr>
 <!-- END topicrow -->
 
+<!-- IF .topicrow or .forumrow -->
 <tr>
 	<td class="cat" colspan="4" align="{S_CONTENT_FLOW_END}"><input class="btnlite" type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" />&nbsp;</td>
 </tr>
+<!-- ENDIF -->
 </table>
-
+<!-- IF .topicrow or .forumrow -->
 <div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 't', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 't', false); return false;">{L_UNMARK_ALL}</a></b></div>
+<!-- ENDIF -->
 
 <!-- INCLUDE ucp_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
index 1d7e11c06e..564faa2524 100644
--- a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
@@ -10,7 +10,7 @@
 	</tr>
 <!-- ENDIF -->
 <tr> 
-	<td class="row3" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
+	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 </tr>
 <tr> 
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}: </b></td>
diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html
index cf401c88a6..f5e8ba032a 100644
--- a/phpBB/styles/subSilver/template/ucp_profile_signature.html
+++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html
@@ -6,7 +6,7 @@
 	<th colspan="2">{L_TITLE}</th>
 </tr>
 <tr>
-	<td colspan="2">{L_SIGNATURE_EXPLAIN}</td>
+	<td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
 </tr>
 
 <!-- IF ERROR -->