2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index ba9c681d4e..7f76449316 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -203,7 +203,7 @@ function mcp_topic_view($id, $mode, $action)
 			{
 				$to_topic_info = $to_topic_info[$to_topic_id];
 
-				if (!$to_topic_info['enable_icons'])
+				if (!$to_topic_info['enable_icons'] || $auth->acl_get('!f_icons', $forum_id))
 				{
 					$s_topic_icons = false;
 				}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 726fd8bfd1..bfb90d0974 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1110,7 +1110,7 @@ if ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_p
 }
 
 $s_topic_icons = false;
-if ($post_data['enable_icons'])
+if ($post_data['enable_icons'] && $auth->acl_get('f_icons', $forum_id))
 {
 	$s_topic_icons = posting_gen_topic_icons($mode, $post_data['icon_id']);
 }