3 files changed, 11 insertions, 14 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 00d521d412..f3aeeb67a2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -714,7 +714,7 @@ function posting_gen_topic_icons($mode, $icon_id)
 					'ICON_WIDTH'	=> $data['width'],
 					'ICON_HEIGHT' 	=> $data['height'],
 	
-					'S_ICON_CHECKED' => ($id == $icon_id && $mode != 'reply') ? ' checked="checked"' : '')
+					'S_ICON_CHECKED' => ($id == $icon_id) ? ' checked="checked"' : '')
 				);
 			}
 		}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index c545718711..7067342534 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -135,7 +135,6 @@ if ($sql)
 	$forum_id	= (int) $forum_id;
 	$topic_id	= (int) $topic_id;
 	$post_id	= (int) $post_id;
-	$icon_id	= 0;
 
 	$post_edit_locked = (isset($post_edit_locked)) ? (int) $post_edit_locked : 0;
 
@@ -857,26 +856,24 @@ if (($mode == 'reply' || $mode == 'quote') && !$preview && !$refresh)
 // Forum moderators?
 get_moderators($moderators, $forum_id);
 
-
 // Generate smilie listing
 generate_smilies('inline', $forum_id);
 
-
-// Generate Topic icons
-$s_topic_icons = false;
-if ($enable_icons)
-{
-	$s_topic_icons = posting_gen_topic_icons($mode, $icon_id);
-}
-
 // Generate inline attachment select box
 posting_gen_inline_attachments($message_parser);
 
-// Topic type selection ... only for first post in topic.
-$topic_type_toggle = false;
+
+// Do show topic icons and topic type selection only in first post.
+$topic_type_toggle = $s_topic_icons = false;
+
 if ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id))
 {
 	$topic_type_toggle = posting_gen_topic_types($forum_id, $topic_type);
+
+	if ($enable_icons)
+	{
+		$s_topic_icons = posting_gen_topic_icons($mode, $icon_id);
+	}
 }
 
 
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 6bc7f3f4db..1ef70b3662 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -168,7 +168,7 @@ function checkForm()
 			<td class="row1"><b class="genmed">{L_ICON}:</b></td>
 			<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 				<tr>
-					<td><input type="radio" name="icon" value="0" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
+					<td><input type="radio" name="icon" value="0" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
 				</tr>
 			</table></td>
 		</tr>