diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php
index 1e8607c..7ddfba4 100755
--- a/Theme/Backend/kanban-board.tpl.php
+++ b/Theme/Backend/kanban-board.tpl.php
@@ -37,7 +37,7 @@ $layout      = \max(4, $columnCount);
                     <article><?= $card->description; ?></article>
 
                     <?php $tags = $card->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/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php
index 235450d..5f1722e 100755
--- a/Theme/Backend/kanban-dashboard.tpl.php
+++ b/Theme/Backend/kanban-dashboard.tpl.php
@@ -45,7 +45,7 @@ echo $this->data['nav']->render(); ?>
             <div class="portlet-body">
                 <article><?= $board->description; ?></article>
                 <?php $tags = $board->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">