diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index bd821cf..976d301 100755
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -44,7 +44,7 @@ echo $this->data['nav']->render(); ?>
             <div class="portlet-body">
                 <article><?= Markdown::parse(\substr($news->plain, 0, 500)); ?></article>
                 <?php $tags = $news->getTags(); foreach ($tags as $tag) : ?>
-                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $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/news-single.tpl.php b/Theme/Backend/news-single.tpl.php
index 7871524..94b29c8 100755
--- a/Theme/Backend/news-single.tpl.php
+++ b/Theme/Backend/news-single.tpl.php
@@ -53,7 +53,10 @@ echo $this->data['nav']->render(); ?>
                 </div>
                 <div>
                     <?php foreach ($tags as $tag) : ?>
-                        <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $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>