diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index b131b9f..4d9fe96 100755
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -82,7 +82,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php $tags = $task->getTags(); foreach ($tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
-                                                <?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?>
+                                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                                                 <?= $this->printHtml($tag->getL11n()); ?>
                                             </span>
                                         </a>
@@ -156,7 +156,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php $tags = $task->getTags(); foreach ($tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
-                                                <?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?>
+                                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                                                 <?= $this->printHtml($tag->getL11n()); ?>
                                             </span>
                                         </a>
@@ -235,7 +235,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php $tags = $task->getTags(); foreach ($tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
-                                                <?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?>
+                                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                                                 <?= $this->printHtml($tag->getL11n()); ?>
                                             </span>
                                         </a>
@@ -320,7 +320,7 @@ echo $this->data['nav']->render(); ?>
                                         <?php $tags = $task->getTags(); foreach ($tags as $tag) : ?>
                                         <a href="<?= $url; ?>">
                                             <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
-                                                <?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?>
+                                                <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                                                 <?= $this->printHtml($tag->getL11n()); ?>
                                             </span>
                                         </a>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index a08d12c..a2af1d4 100755
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -88,7 +88,7 @@ echo $this->data['nav']->render(); ?>
                     $tags = $task->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()); ?>
+                        <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?><?= $this->printHtml($tag->getL11n()); ?>
                     </span>
                 <?php endforeach; ?>
                 <?php if (!empty($taskMedia)) : ?>