diff --git a/Theme/Backend/qa-dashboard.tpl.php b/Theme/Backend/qa-dashboard.tpl.php
index 584d44e..7f6c01e 100755
--- a/Theme/Backend/qa-dashboard.tpl.php
+++ b/Theme/Backend/qa-dashboard.tpl.php
@@ -59,7 +59,10 @@ echo $this->data['nav']->render(); ?>
                     <?php foreach ($question->tags as $tag) :
                         if ($tag->id === 0) { continue; }
                     ?>
-                        <span class="tag"><?= empty($tag->icon) ? '' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                        <span class="tag">
+                            <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
+                            <?= $this->printHtml($tag->getL11n()); ?>
+                        </span>
                     <?php endforeach; ?>
                 </div>
 
diff --git a/Theme/Backend/qa-question-create.tpl.php b/Theme/Backend/qa-question-create.tpl.php
index 9c38503..2c0456e 100755
--- a/Theme/Backend/qa-question-create.tpl.php
+++ b/Theme/Backend/qa-question-create.tpl.php
@@ -49,7 +49,10 @@ echo $this->data['nav']->render();
                                 foreach ($question->tags as $tag) :
                                     if ($tag->id === 0) { continue; }
                             ?>
-                                <span class="tag"><?= empty($tag->icon) ? '' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                                <span class="tag">
+                                    <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
+                                    <?= $this->printHtml($tag->getL11n()); ?>
+                                </span>
                             <?php endforeach; ?>
                         </div>
 
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index 2eb719b..76b0bb2 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -82,7 +82,10 @@ echo $this->data['nav']->render();
                             foreach ($question->tags as $tag) :
                                 if ($tag->id === 0) { continue; }
                         ?>
-                            <span class="tag"><?= empty($tag->icon) ? '' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                            <span class="tag">
+                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
+                                <?= $this->printHtml($tag->getL11n()); ?>
+                            </span>
                         <?php endforeach; ?>
                     </div>