diff --git a/phpBB/templates/PSO/jumpbox.tpl b/phpBB/templates/PSO/jumpbox.tpl
index 55bb1824eb..80889807a5 100644
--- a/phpBB/templates/PSO/jumpbox.tpl
+++ b/phpBB/templates/PSO/jumpbox.tpl
@@ -1,6 +1,6 @@
 
 <form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
+		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;<input class="outsidetable" type="submit" value="{L_GO}" /></span></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/PSO/posting_body.tpl b/phpBB/templates/PSO/posting_body.tpl
index 93645772ec..2711c1abb5 100644
--- a/phpBB/templates/PSO/posting_body.tpl
+++ b/phpBB/templates/PSO/posting_body.tpl
@@ -68,7 +68,7 @@ function emoticon(theSmilie) {
 			<!-- BEGIN privmsg_extensions -->
 			<tr>
 				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
-				<td class="row2"><input type="text" name="username" maxlength="50" size="20" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
+				<td class="row2"><input type="text" name="username" maxlength="50" size="20" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
 			</tr>
 			<!-- END privmsg_extensions -->
             <tr>
diff --git a/phpBB/templates/PSO/search_username.tpl b/phpBB/templates/PSO/search_username.tpl
index 8e15db70de..946ca5a325 100644
--- a/phpBB/templates/PSO/search_username.tpl
+++ b/phpBB/templates/PSO/search_username.tpl
@@ -8,34 +8,19 @@ function refresh_username(selected_username)
 //-->
 </script>
 
-<form method="post" name="search" action="{S_SEARCH_ACTION}">
-  <table width="100%" border="0" cellspacing="0" cellpadding="10">
+<form method="post" name="search" action="{S_SEARCH_ACTION}"><table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
-	  <td>
-		<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
-		  <tr> 
-			<th class="thHead" height="25">{L_SEARCH_USERNAME}</th>
-		  </tr>
-		  <tr> 
-			<td valign="top" class="row1"><span class="genmed"><br />
-			  <input type="text" name="search_author" value="{AUTHOR}" class="post" />
-			  &nbsp; 
-			  <input type="submit" name="search" value="{L_SEARCH}" class="liteoption" />
-			  </span><br />
-			  <span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
-			  <!-- BEGIN switch_select_name -->
-			  <span class="genmed">{L_UPDATE_USERNAME}<br />
-			  <select name="author_list">{S_AUTHOR_OPTIONS}
-			  </select>
-			  &nbsp; 
-			  <input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" />
-			  </span><br />
-			  <!-- END switch_select_name -->
-			  <br />
-			  <span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
-		  </tr>
-		</table>
-	  </td>
+		<td class="tablebg"><table width="100%" border="0" cellspacing="1" cellpadding="3">
+			<tr>
+				<th>{L_SEARCH_USERNAME}</th>
+			</tr>
+			<tr>
+				<td valign="top" class="row1"><span class="gensmall"><br /><input type="text" name="search_author" value="{AUTHOR}" class="post" />&nbsp;<input class="mainoptiontable" type="submit" name="search" value="{L_SEARCH}" class="liteoption" /></span><br /><span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
+				<!-- BEGIN switch_select_name -->
+				<span class="gensmall">{L_UPDATE_USERNAME}<br /><select name="author_list">{S_AUTHOR_OPTIONS}</select>&nbsp;<input class="liteoptiontable" type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
+				<!-- END switch_select_name -->
+				<br /><span class="gensmall"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
+			</tr>
+		</table></td>
 	</tr>
-  </table>
-</form>
+</table></form>