diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 553676d..14358e4 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -99,6 +99,7 @@ final class ApiController extends Controller
                 if (!isset($tag['id'])) {
                     $request->setData('title', $tag['title'], true);
                     $request->setData('color', $tag['color'], true);
+                    $request->setData('icon', $tag['icon'] ?? null, true);
                     $request->setData('language', $tag['language'], true);
 
                     $internalResponse = new HttpResponse();
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 218e8cb..ebdd355 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
                     <div class="portlet-foot">
                         <div class="overflowfix">
                             <?php $tags = $doc->getTags(); foreach ($tags as $tag) : ?>
-                                <span class="tag" style="background: <?= $this->printHtml($tag->getColor()); ?>"><?= $this->printHtml($tag->getTitle()); ?></span>
+                                <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getTitle()); ?></span>
                             <?php endforeach; ?>
                             <a href="<?= $url; ?>" class="button floatRight">More</a>
                         </div>
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index 5899f70..37bd7d1 100755
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render();
                 <div class="row">
                     <div class="col-xs-6 overflowfix">
                         <?php foreach ($tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->getColor()); ?>"><?= $this->printHtml($tag->getTitle()); ?></span>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getTitle()); ?></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>