diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 574e8d9..c18e4a0 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -118,6 +118,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/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 2961b3c..94c1be4 100755
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -98,7 +98,7 @@ echo $this->getData('nav')->render(); ?>
                             <?php endif; ?>
 
                             <?php $tags = $task->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; ?>
                         </div>
                     </div>