diff --git a/Controller.js b/Controller.js
index 0543c29..f486284 100755
--- a/Controller.js
+++ b/Controller.js
@@ -1,4 +1,3 @@
-import { jsOMS }      from '../../jsOMS/Utils/oLib.js';
 import { Autoloader } from '../../jsOMS/Autoloader.js';
 import { Editor } from './Models/Editor.js';
 
diff --git a/Theme/Backend/editor-view.tpl.php b/Theme/Backend/editor-view.tpl.php
index 772de87..d384070 100644
--- a/Theme/Backend/editor-view.tpl.php
+++ b/Theme/Backend/editor-view.tpl.php
@@ -32,7 +32,10 @@ echo $this->data['nav']->render(); ?>
                 <article><?= $doc->content; ?></article>
                 <?php if (!empty($doc->tags)) : ?>
                     <?php foreach ($doc->tags as $tag) : ?>
-                        <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : ''; ?><?= $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; ?>
                 <?php endif; ?>
                 <?php if (!empty($files)) : ?>