Index: includes/ucp/ucp_profile.php
===================================================================
--- includes/ucp/ucp_profile.php	(revision 10959)
+++ includes/ucp/ucp_profile.php	(working copy)
@@ -552,6 +552,9 @@
 				// Build custom bbcodes array
 				display_custom_bbcodes();
 
+				// Generate smiley listing
+				generate_smilies('inline', $forum_id);
+
 			break;
 
 			case 'avatar':
Index: styles/prosilver/template/posting_smilies.html
===================================================================
--- styles/prosilver/template/posting_smilies.html	(revision 10959)
+++ styles/prosilver/template/posting_smilies.html	(working copy)
@@ -2,8 +2,8 @@
 
 <script type="text/javascript">
 // <![CDATA[
-	var form_name = 'postform';
-	var text_name = 'message';
+	var form_name = opener.form_name;
+	var text_name = opener.text_name;
 // ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
Index: styles/subsilver2/template/posting_smilies.html
===================================================================
--- styles/subsilver2/template/posting_smilies.html	(revision 10959)
+++ styles/subsilver2/template/posting_smilies.html	(working copy)
@@ -2,8 +2,8 @@
 
 <script type="text/javascript">
 // <![CDATA[
-	var form_name = 'postform';
-	var text_name = 'message';
+	var form_name = opener.form_name;
+	var text_name = opener.text_name;
 // ]]>
 </script>
 <script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
Index: styles/subsilver2/template/ucp_profile_signature.html
===================================================================
--- styles/subsilver2/template/ucp_profile_signature.html	(revision 10959)
+++ styles/subsilver2/template/ucp_profile_signature.html	(working copy)
@@ -5,9 +5,11 @@
 <tr>
 	<th colspan="2">{L_TITLE}</th>
 </tr>
-<tr>
-	<td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
-</tr>
+<!-- IF not S_SMILIES_ALLOWED -->
+    <tr>
+        <td colspan="2" class="row1">{L_SIGNATURE_EXPLAIN}</td>
+    </tr>
+<!-- ENDIF -->
 
 <!-- IF ERROR -->
 	<tr>
@@ -16,7 +18,7 @@
 <!-- ENDIF -->
 
 <tr>
-	<td colspan="2" class="row2">
+	<td colspan="2" style="padding:0">
 		<script type="text/javascript">
 		// <![CDATA[
 			var form_name = 'ucp';
@@ -24,6 +26,33 @@
 		// ]]>
 		</script>
 		
+<table cellspacing="0">
+<tr>
+    <!-- IF S_SMILIES_ALLOWED -->
+	<td class="row1" width="22%" valign="top" style="border-right:1px solid #a9b8c2">
+    	{L_SIGNATURE_EXPLAIN}
+        <!-- IF .smiley -->
+		<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
+		<tr>
+			<td class="gensmall" align="center"><b>{L_SMILIES}</b></td>
+		</tr>
+		<tr>
+			<td align="center">
+				<!-- BEGIN smiley -->
+					<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a>
+				<!-- END smiley -->
+			</td>
+		</tr>
+			<!-- IF S_SHOW_SMILEY_LINK -->
+			<tr>
+				<td align="center"><a class="nav" href="{U_MORE_SMILIES}" onclick="popup(this.href, 300, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></td>
+			</tr>
+			<!-- ENDIF -->
+		</table>
+        <!-- ENDIF -->
+    </td>
+    <!-- ENDIF -->
+    <td class="row2">
 		<table cellspacing="0" cellpadding="2" border="0" width="99%">
 		<!-- INCLUDE posting_buttons.html -->
 		<tr>
@@ -47,6 +76,10 @@
 		</tr>
 		<!-- ENDIF -->
 		</table>
+		</td>
+	</tr>
+</table>
+
 	</td>
 </tr>
 <tr>