diff --git a/phpBB/templates/PSO/admin/admin_smile.tpl b/phpBB/templates/PSO/admin/admin_smile.tpl
deleted file mode 100644
index 32bfb5fa39..0000000000
--- a/phpBB/templates/PSO/admin/admin_smile.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<br clear="all" />
-
-<h1>{L_SMILEY_TITLE}</h1>
-
-<P>{L_SMILEY_TEXT}</p>
-
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="5"><a href="{S_SMILEY_URL}&mode=add">{L_SMILEY_ADD}</a></th>
-	</tr>
-	<tr>
-		<th>{L_CODE}</th>
-		<th>{L_SMILE}</th>
-		<th>{L_EMOT}</th>
-		<th colspan="2">{L_ACTION}</th>
-	</tr>
-	<!-- BEGIN smiles -->
-	<tr>
-		<td class="row2">{smiles.CODE}</td>
-		<td class="row2"><img src='{S_SMILEY_BASEDIR}/{smiles.URL}' alt='{smiles.CODE}'></td>
-		<td class="row2">{smiles.EMOT}</td>
-		<td class="row2"><a href="{S_SMILEY_URL}&mode=edit&id={smiles.ID}">{L_EDIT}</a></td>
-		<td class="row2"><a href="{S_SMILEY_URL}&mode=delete&id={smiles.ID}">{L_DELETE}</a></td>
-	</tr>
-	<!-- END smiles -->
-</table>
diff --git a/phpBB/templates/PSO/admin/smile_edit.tpl b/phpBB/templates/PSO/admin/smile_edit.tpl
deleted file mode 100644
index 0b15de9de2..0000000000
--- a/phpBB/templates/PSO/admin/smile_edit.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<br clear="all" />
-
-<h1>{L_SMILEY_TITLE}</h1>
-
-<P>{L_SMILEY_INSTR}</p>
-<script language="javascript">
-<!--
-function update_smiley(newimage)
-{
-	document.smiley_image.src = '{S_SMILEY_BASEDIR}/' + newimage;
-}
--->
-</script>
-<form method="post" action="{S_SMILEY_ACTION}">
-<input type="hidden" name="mode" value="{S_HIDDEN_VAR}">
-<input type="hidden" name="id" value="{SMILEY_ID_VAL}">
-<table cellspacing="1" cellpadding="4" border="0" align="center">
-	<tr>
-		<th colspan="2">{L_SMILEY_CONFIG}</th>
-	</tr>
-	<tr>
-		<td class="row2">{L_SMILEY_CODE_LBL}</td>
-		<td class="row2"><input type="text" name="code" value="{SMILEY_CODE_VAL}" /></td>
-	</tr>
-	<tr>
-		<td class="row1">{L_SMILEY_URL_LBL}</td>
-		<td class="row1"><select name="url" onchange="update_smiley(this.options[selectedIndex].value);">
-			<!-- BEGIN smile_images -->
-			<option value="{smile_images.FILENAME}" {smile_images.SELECTED}>{smile_images.FILENAME}</option>
-			<!-- END smile_images -->
-			</select>
-			<img name='smiley_image' src="{S_SMILEY_BASEDIR}/{SMILEY_URL_VAL}" border=0 alt="smiley"></td>
-	</tr>
-	<tr>
-		<td class="row2">{L_SMILEY_EMOTION_LBL}</td>
-		<td class="row2"><input type="text" name="emotion" value="{SMILEY_EMOTION}" /></td>
-	</tr>
-	<tr>
-		<td class="cat" colspan="2" align="center"><input type="submit" value="{L_SUBMIT}" /></td>
-	</tr>
-</table></form>
diff --git a/phpBB/templates/PSO/admin/smile_edit_body.tpl b/phpBB/templates/PSO/admin/smile_edit_body.tpl
new file mode 100644
index 0000000000..0d6e9d3e61
--- /dev/null
+++ b/phpBB/templates/PSO/admin/smile_edit_body.tpl
@@ -0,0 +1,38 @@
+
+<br clear="all" />
+
+<h1>{L_SMILEY_TITLE}</h1>
+
+<p>{L_SMILEY_EXPLAIN}</p>
+
+<script language="javascript" type="text/javascript">
+<!--
+
+function update_smiley(newimage)
+{
+	document.smiley_image.src = "{S_SMILEY_BASEDIR}/" + newimage;
+}
+
+// -->
+</script>
+
+<form method="post" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+	<tr>
+		<th colspan="2">{L_SMILEY_CONFIG}</th>
+	</tr>
+	<tr>
+		<td class="row2">{L_SMILEY_CODE}</td>
+		<td class="row2"><input type="text" name="smile_code" value="{SMILEY_CODE}" /></td>
+	</tr>
+	<tr>
+		<td class="row1">{L_SMILEY_URL}</td>
+		<td class="row1"><select name="smile_url" onchange="update_smiley(this.options[selectedIndex].value);">{S_FILENAME_OPTIONS}</select> &nbsp; <img name="smiley_image" src="{SMILEY_IMG}" border="0" alt="" /> &nbsp;</td>
+	</tr>
+	<tr>
+		<td class="row2">{L_SMILEY_EMOTION}</td>
+		<td class="row2"><input type="text" name="smile_emotion" value="{SMILEY_EMOTICON}" /></td>
+	</tr>
+	<tr>
+		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SUBMIT}" /></td>
+	</tr>
+</table></form>
diff --git a/phpBB/templates/PSO/admin/smile_list_body.tpl b/phpBB/templates/PSO/admin/smile_list_body.tpl
new file mode 100644
index 0000000000..f2a5ed4b95
--- /dev/null
+++ b/phpBB/templates/PSO/admin/smile_list_body.tpl
@@ -0,0 +1,27 @@
+
+<br clear="all" />
+
+<h1>{L_SMILEY_TITLE}</h1>
+
+<P>{L_SMILEY_TEXT}</p>
+
+<form method="GET" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+	<tr>
+		<th>{L_CODE}</th>
+		<th>{L_SMILE}</th>
+		<th>{L_EMOT}</th>
+		<th colspan="2">{L_ACTION}</th>
+	</tr>
+	<!-- BEGIN smiles -->
+	<tr>
+		<td class="row2">{smiles.CODE}</td>
+		<td class="row2"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" /></td>
+		<td class="row2">{smiles.EMOT}</td>
+		<td class="row2"><a href="{smiles.U_SMILEY_EDIT}">{L_EDIT}</a></td>
+		<td class="row2"><a href="{smiles.U_SMILEY_DELETE}">{L_DELETE}</a></td>
+	</tr>
+	<!-- END smiles -->
+	<tr>
+		<td class="cat" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SMILEY_ADD}" /></td>
+	</tr>
+</table></form>
diff --git a/phpBB/templates/PSO/admin/smile_action.tpl b/phpBB/templates/PSO/admin/smile_result_body.tpl
similarity index 82%
rename from phpBB/templates/PSO/admin/smile_action.tpl
rename to phpBB/templates/PSO/admin/smile_result_body.tpl
index 2d01b17eb8..a0c9b5bfc0 100644
--- a/phpBB/templates/PSO/admin/smile_action.tpl
+++ b/phpBB/templates/PSO/admin/smile_result_body.tpl
@@ -8,9 +8,7 @@
 				<td class="cat" align="center"><span class="cattitle"><b>{L_SMILEY_TITLE}</b></span></td>
 			</tr>
 			<tr>
-				<td class="row2" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br>
-				<a href='{S_SMILEY_URL}'>{L_SMILEY_TEXT}</a>
-				</td>
+				<td class="row2" width="100%" align="center"><span class="gen">{L_SMILEY_ACTION}</span><br /><a href="{U_SMILEY_ADMIN}">{L_SMILEY_TEXT}</a></td>
 			</tr>
 		</table></td>
 	</tr>