diff --git a/phpBB/templates/Euclid/profile_add_body.tpl b/phpBB/templates/Euclid/profile_add_body.tpl
index f168278733..43f316fabb 100644
--- a/phpBB/templates/Euclid/profile_add_body.tpl
+++ b/phpBB/templates/Euclid/profile_add_body.tpl
@@ -7,9 +7,9 @@
 
 <table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
 	<tr>
-		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="3" border="0">
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
 			</tr>
 			<tr>
 				<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
@@ -28,7 +28,7 @@
 				<td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
 			</tr>
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
@@ -67,7 +67,7 @@
 				<td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
 			</tr>
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
@@ -123,7 +123,7 @@
 			</tr>
 			<!-- BEGIN avatarblock -->
 			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
+				<td class="cat" colspan="2" height="30"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
 			</tr>
 			<tr>
 				<td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
@@ -157,7 +157,7 @@
 			<!-- END avatargallery -->
 			<!-- END avatarblock -->
 			<tr>
-			   	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
+			   	<td class="cat" colspan="2" height="30" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="liteoptiontable" type="reset" value="{L_RESET}" /></td>
 			</tr>
 		</table></td>
 	</tr>
diff --git a/phpBB/templates/Euclid/profile_send_email.tpl b/phpBB/templates/Euclid/profile_send_email.tpl
index 21d56f99ea..e34ab2a805 100644
--- a/phpBB/templates/Euclid/profile_send_email.tpl
+++ b/phpBB/templates/Euclid/profile_send_email.tpl
@@ -31,56 +31,57 @@ function checkForm(formObj) {
 
 {ERROR_BOX}
 
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
+		<td><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
 	</tr>
 </table>
 
-<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
-	<tr> 
-		<th class="thHead" colspan="2" height="25"><b>{L_SEND_EMAIL_MSG}</b></th>
-	</tr>
-	<tr> 
-		<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
-		<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
-	</tr>
-	<tr> 
-		<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
-		<td class="row2" width="78%"><span class="gen"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span> </td>
-	</tr>
-	<tr> 
-		<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
-		<td class="row2"><span class="gen"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
-	</tr>
-	<tr> 
-		<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
-		<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+<table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
+	<tr>
+		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="3" border="0">
 			<tr> 
-				<td><input type="checkbox" name="cc_email"  value="1" checked="checked" /></td>
-				<td><span class="gen">{L_CC_EMAIL}</span></td>
+				<td class="cat" colspan="2" height="30" align="center"><span class="cattitle">{L_SEND_EMAIL_MSG}</span></td>
+			</tr>
+			<tr> 
+				<td class="row1" width="22%"><span class="gen"><b>{L_RECIPIENT}</b></span></td>
+				<td class="row2" width="78%"><span class="gen"><b>{USERNAME}</b></span> </td>
+			</tr>
+			<tr> 
+				<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
+				<td class="row2" width="78%"><span class="courier"><input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /></span></td>
+			</tr>
+			<tr> 
+				<td class="row1" valign="top"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br /><span class="gensmall">{L_MESSAGE_BODY_DESC}</span></td>
+				<td class="row2"><span class="courier"><textarea name="message" rows="25" cols="40" wrap="virtual" style="width:500px" tabindex="3" class="post">{MESSAGE}</textarea></span></td>
+			</tr>
+			<tr> 
+				<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
+				<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
+					<tr> 
+						<td><input type="checkbox" name="cc_email"  value="1" checked="checked" /></td>
+						<td><span class="gen">{L_CC_EMAIL}</span></td>
+					</tr>
+				</table></td>
+			</tr>
+			<tr>
+				<td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
+				<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
+				<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
+				<!-- Remember to uncomment the link to the javascript file at the top of this template -->
+				<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->&nbsp;
+				<!-- End spellchecker option -->
+				<input class="mainoptiontable" type="submit" tabindex="6" name="submit" value="{L_SEND_EMAIL}" /></td>
 			</tr>
 		</table></td>
 	</tr>
-	<tr>
-		<td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
-		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
-		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
-		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
-		<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
-		<!-- End spellchecker option -->
-		&nbsp;<input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
-	</tr>
 </table>
 
-<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+</form>
+
+<table width="98%" cellspacing="2" cellpadding="0" border="0" align="center">
 	<tr> 
-		<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
-	</tr>
-</table></form>
-
-<table width="100%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td valign="top" align="right">{JUMPBOX}</td>
+		<td valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+		<td align="right">{JUMPBOX}</td>
 	</tr>
 </table>
diff --git a/phpBB/templates/Euclid/search_body.tpl b/phpBB/templates/Euclid/search_body.tpl
index a27df1cd87..a167586ee1 100644
--- a/phpBB/templates/Euclid/search_body.tpl
+++ b/phpBB/templates/Euclid/search_body.tpl
@@ -1,7 +1,7 @@
 
-<form action="{S_SEARCH_ACTION}" method="POST">
+<form action="{S_SEARCH_ACTION}" method="post">
 
-<table width="98%" cellspacing="2" cellpadding="2" border="0" align="center">
+<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr> 
 		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
 	</tr>
@@ -11,7 +11,7 @@
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<th colspan="4" height="25">{L_SEARCH_QUERY}</th>
+				<td class="cat" colspan="4" height="30" align="center"><span class="cattitle">{L_SEARCH_QUERY}</span></td>
 			</tr>
 			<tr> 
 				<td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
@@ -22,13 +22,13 @@
 				<td class="row2" colspan="2" valign="middle"><span class="genmed"> <input type="text" style="width: 300px" name="search_author" size="30" /></span></td>
 			</tr>
 			<tr> 
-				<th colspan="4" height="25">{L_SEARCH_OPTIONS}</th>
+				<td class="cat" colspan="4" height="30" align="center"><span class="cattitle">{L_SEARCH_OPTIONS}</span></td>
 			</tr>
 			<tr>
 				<td class="row1" align="right"><span class="gen">{L_FORUM}:&nbsp;</span></td>
 				<td class="row2"><span class="gensmall"><select class="post" name="searchforum">{S_FORUM_OPTIONS}</select></span></td>
 				<td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
-				<td class="row2"><span class="gensmall"><select class="post" name="charsreqd">{S_CHARACTER_OPTIONS}</select></span><span class="gen">{L_CHARACTERS}</span></td>
+				<td class="row2"><span class="gensmall"><select class="post" name="charsreqd">{S_CHARACTER_OPTIONS}</select></span> <span class="gen">{L_CHARACTERS}</span></td>
 			</tr>
 			<tr> 
 				<td class="row1" align="right"><span class="gen">{L_CATEGORY}:&nbsp;</span></td>
@@ -38,13 +38,12 @@
 			</tr>
 			<tr> 
 				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}:&nbsp;</span></td>
-				<td class="row2" nowrap="nowrap"><input type="radio" name="showresults" value="posts" /><span class="gen">{L_POSTS}<input type="radio" name="showresults" value="topics" checked="checked" />
-		{L_TOPICS}</span></td>
+				<td class="row2" nowrap="nowrap"><input type="radio" name="showresults" value="posts" /><span class="gen">{L_POSTS}<input type="radio" name="showresults" value="topics" checked="checked" />{L_TOPICS}</span></td>
 				<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}:&nbsp;</span></td>
 				<td class="row2" valign="middle"><span class="gensmall"><select class="post" name="resultdays">{S_TIME_OPTIONS}</select></span></td>
 			</tr>
 			<tr> 
-				<td class="cat" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" value="{L_SEARCH}" /></td>
+				<td class="cat" colspan="4" height="30" align="center">{S_HIDDEN_FIELDS}<input class="mainoptiontable" type="submit" value="{L_SEARCH}" /></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -52,9 +51,7 @@
 
 <table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
-		<td align="right" valign="middle"><span class="gensmall">{S_TIMEZONE}</span><br /><br /></td>
-	<tr>
-	<tr>
+		<td valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
 		<td align="right" valign="top">{JUMPBOX}</td>
 	</tr>
 </table>