diff --git a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
index 429d033..7898d1d 100755
--- a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
+++ b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
@@ -10,7 +10,7 @@
         <li><i data-editor-button="a" class="btn editor-button g-icon">superscript</i>
         <li><i data-editor-button="a" class="btn editor-button g-icon">brush</i>
         <li><i data-editor-button="a" class="btn editor-button g-icon">edit</i>
-        <li><i data-editor-button="ulist" class="btn editor-button g-icon">format_list_bullted</i>
+        <li><i data-editor-button="ulist" class="btn editor-button g-icon">format_list_bulleted</i>
         <li><i data-editor-button="olist" class="btn editor-button g-icon">format_list_numbered</i>
         <li><i data-editor-button="indent" class="btn editor-button g-icon">format_indent_increase</i>
         <li><i data-editor-button="a" class="btn editor-button g-icon">format_indent_decrease</i>
diff --git a/Theme/Backend/editor-single.tpl.php b/Theme/Backend/editor-single.tpl.php
index 2c431a0..57f6950 100755
--- a/Theme/Backend/editor-single.tpl.php
+++ b/Theme/Backend/editor-single.tpl.php
@@ -35,7 +35,7 @@ echo $this->data['nav']->render(); ?>
                 <article><?= $doc->content; ?></article>
                 <?php if (!empty($tags)) : ?>
                     <?php 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; ?>
                 <?php endif; ?>
                 <?php if (!empty($files)) : ?>