diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 2135309..32997bb 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -38,7 +38,10 @@ echo $this->data['nav']->render(); ?>
                             <?= Markdown::parse(\substr($doc->docRaw, 0, 500)); ?>
                         </article>
                         <?php foreach ($doc->tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
+                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
+                                <?= $this->printHtml($tag->getL11n()); ?>
+                            </span>
                         <?php endforeach; ?>
                     </div>
                     <div class="portlet-foot">
diff --git a/Theme/Backend/wiki-doc-view.tpl.php b/Theme/Backend/wiki-doc-view.tpl.php
index 0737b5e..813a826 100644
--- a/Theme/Backend/wiki-doc-view.tpl.php
+++ b/Theme/Backend/wiki-doc-view.tpl.php
@@ -39,7 +39,10 @@ echo $this->data['nav']->render();
                 <article><?= $doc->doc; ?></article>
 
                 <?php foreach ($doc->tags as $tag) : ?>
-                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
+                        <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
+                        <?= $this->printHtml($tag->getL11n()); ?>
+                    </span>
                 <?php endforeach; ?>
 
                 <?php $files = $doc->files; foreach ($files as $file) : ?>