diff --git a/src/site/template/aurelia/layouts/topic/moderate/default.php b/src/site/template/aurelia/layouts/topic/moderate/default.php
index 42ad833d7f..d272104e30 100644
--- a/src/site/template/aurelia/layouts/topic/moderate/default.php
+++ b/src/site/template/aurelia/layouts/topic/moderate/default.php
@@ -21,6 +21,7 @@
 use Kunena\Forum\Libraries\Icons\KunenaIcons;
 use Kunena\Forum\Libraries\Icons\KunenaSvgIcons;
 use Kunena\Forum\Libraries\Route\KunenaRoute;
+use Kunena\Forum\Libraries\User\KunenaUserHelper;
 
 HTMLHelper::_('bootstrap.framework');
 
@@ -90,82 +91,74 @@
                                 <dd><strong> <?php echo $this->userLink; ?></strong></dd>
                             <?php endif; ?>
                         </dl>
-                        <?php if ($this->config->topicIcons) :
-                        ?>
-                            <div><?php echo Text::_('COM_KUNENA_MODERATION_CHANGE_TOPIC_ICON'); ?>:</div>
-                            <br />
-                            <div class="kmoderate-topicIcons">
-    <?php foreach ($this->topicIcons as $icon) : ?>
-        <input type="radio" 
-               id="radio<?php echo $icon->id; ?>" 
-               name="topic_emoticon"
-               value="<?php echo $icon->id; ?>" 
-               <?php echo !empty($icon->checked) ? ' checked="checked" ' : ''; ?> 
-        />
-        
-        <?php 
-        // Set default iconset if not defined
-        if (!$this->category->iconset) {
-            $this->category->iconset = 'default';
-        }
-        
-        // Determine icon type and render accordingly
-        $topicicontype = $this->config->topicIcons ? $topicicontype : null;
-        ?>
-        
-        <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>">
-            <?php if ($topicicontype === 'svg'): ?>
-                <?php echo KunenaSvgIcons::loadsvg($icon->svg, 'usertopicIcons', $this->category->iconset); ?>
-            <?php elseif ($topicicontype === 'fa'): ?>
-                <i class="fa fa-<?php echo $icon->fa; ?> glyphicon-topic fa-2x"></i>
-            <?php else: ?>
-                <img loading="lazy"
-                     src="<?php echo $icon->relpath; ?>"
-                     alt="<?php echo $icon->name; ?>"
-                     style="border:0;" 
-                />
-            <?php endif; ?>
-        </label>
-    <?php endforeach; ?>
-</div>
+                       <?php $canModerate = KunenaUserHelper::getMyself()->isModerator($this->category);?>
+                        <?php if ($this->config->topicIcons || $canModerate || $this->me->authorise('core.admin')): ?>
+    <div><?php echo Text::_('COM_KUNENA_MODERATION_CHANGE_TOPIC_ICON'); ?>:</div>
+    <br />
+    <div class="kmoderate-topicIcons">
+        <?php foreach ($this->topicIcons as $icon): ?>
+            <input type="radio" 
+                   id="radio<?php echo $icon->id; ?>" 
+                   name="topic_emoticon"
+                   value="<?php echo $icon->id; ?>" 
+                   <?php echo !empty($icon->checked) ? ' checked="checked" ' : ''; ?> 
+            />
+            
+            <?php 
+            if (!$this->category->iconset) {
+                $this->category->iconset = 'default';
+            }
+            
+            $topicicontype = $this->ktemplate->params->get('topicicontype');
+            ?>
+            
+            <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>">
+                <?php if ($topicicontype === 'svg'): ?>
+                    <?php echo KunenaSvgIcons::loadsvg($icon->svg, 'usertopicIcons', $this->category->iconset); ?>
+                <?php elseif ($topicicontype === 'fa'): ?>
+                    <i class="fa fa-<?php echo $icon->fa; ?> glyphicon-topic fa-2x"></i>
+                <?php else: ?>
+                    <img loading="lazy"
+                         src="<?php echo $icon->relpath; ?>"
+                         alt="<?php echo $icon->name; ?>"
+                         style="border:0;" 
+                    />
+                <?php endif; ?>
+            </label>
+        <?php endforeach; ?>
+    </div>
+<?php endif; ?>
 
-<?php if ($labels && !$this->config->topicIcons): ?>
+<?php if ($labels && !$this->config->topicIcons && !$canModerate && !$this->me->authorise('core.admin')): ?>
     <div>
         <strong><?php echo Text::_('COM_KUNENA_MODERATION_CHANGE_LABEL'); ?>:</strong>
     </div>
     <br />
-                            <div class="kmoderate-topicIcons">
-                                <?php foreach ($this->topicIcons as $icon) :
-                                ?>
-                                    <input type="radio" id="radio<?php echo $icon->id ?>" name="topic_emoticon"
-                                        value="<?php echo $icon->id ?>" <?php echo !empty($icon->checked) ? ' checked="checked" ' : '' ?> />
-                                    <?php if ($topicicontype == 'svg') :
-                                    ?>
-                                        <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>">
-                                            <?php
-                                            if (!$this->category->iconset) :
-                                                $this->category->iconset = 'default';
-                                            endif; ?>
-                                            <?php echo KunenaSvgIcons::loadsvg($icon->svg, 'usertopicIcons', $this->category->iconset); ?>
-                                        <?php elseif ($topicicontype == 'fa') :
-                                        ?>
-                                            <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>"><i
-                                                    class="fa fa-<?php echo $icon->fa; ?> glyphicon-topic fa-2x"></i>
-                                            <?php else :
-                                            ?>
-                                                <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>"><img
-                                                        loading=lazy
-                                                        src="<?php echo $icon->relpath; ?>"
-                                                        alt="<?php echo $icon->name; ?>"
-                                                        style="border:0;" />
-                                                <?php endif; ?>
-                                                </label>
-                                            <?php endforeach; ?>
-                            </div>
-                            <br />
-                        <?php endif; ?>
-                        <br />
-                        <?php endif; ?>
+    <div class="kmoderate-topicIcons">
+        <?php foreach ($this->topicIcons as $icon): ?>
+            <input type="radio" 
+                   id="radio<?php echo $icon->id ?>" 
+                   name="topic_emoticon"
+                   value="<?php echo $icon->id ?>" 
+                   <?php echo !empty($icon->checked) ? ' checked="checked" ' : '' ?> 
+            />
+            <label class="radio inline" for="radio<?php echo $icon->id; ?>" title="<?php echo Text::_($icon->title); ?>">
+                <?php if ($topicicontype === 'svg'): ?>
+                    <?php echo KunenaSvgIcons::loadsvg($icon->svg, 'usertopicIcons', $this->category->iconset); ?>
+                <?php elseif ($topicicontype === 'fa'): ?>
+                    <i class="fa fa-<?php echo $icon->fa; ?> glyphicon-topic fa-2x"></i>
+                <?php else: ?>
+                    <img loading="lazy"
+                         src="<?php echo $icon->relpath; ?>"
+                         alt="<?php echo $icon->name; ?>"
+                         style="border:0;" 
+                    />
+                <?php endif; ?>
+            </label>
+        <?php endforeach; ?>
+    </div>
+    <br />
+<?php endif; ?>
                         <?php if (isset($this->message)) :
                         ?>
                             <hr />