diff --git a/Theme/Backend/tag-create.tpl.php b/Theme/Backend/tag-create.tpl.php
index a8d8444..1858dfd 100755
--- a/Theme/Backend/tag-create.tpl.php
+++ b/Theme/Backend/tag-create.tpl.php
@@ -22,14 +22,20 @@ echo $this->data['nav']->render(); ?>
             <form id="fUnitCreate" method="put" action="<?= UriFactory::build('{/api}tag'); ?>">
                 <div class="portlet-head"><?= $this->getHtml('Tag'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tr><td><label for="iTitle"><?= $this->getHtml('Title'); ?></label>
-                        <tr><td><input type="text" name="title" id="iTitle" placeholder="oms" required>
-                        <tr><td><label for="iColor"><?= $this->getHtml('Color'); ?></label>
-                        <tr><td><input type="color" name="color" id="iColor"required>
-                        <tr><td><label for="iIcon"><?= $this->getHtml('Icon'); ?></label>
-                        <tr><td><input type="text" name="icon" id="iIcon" placeholder="oms" value="<?= $this->printHtml($tag->icon); ?>">
-                    </table>
+                    <div class="form-group">
+                        <label for="iTitle"><?= $this->getHtml('Title'); ?></label>
+                       <input type="text" name="title" id="iTitle" placeholder="oms" required>
+                    </div>
+
+                    <div class="form-group">
+                       <label for="iColor"><?= $this->getHtml('Color'); ?></label>
+                       <input type="color" name="color" id="iColor"required>
+                    </div>
+
+                    <div class="form-group">
+                       <label for="iIcon"><?= $this->getHtml('Icon'); ?></label>
+                       <input type="text" name="icon" id="iIcon" placeholder="oms" value="<?= $this->printHtml($tag->icon); ?>">
+                    </div>
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
diff --git a/Theme/Backend/tag-list.tpl.php b/Theme/Backend/tag-list.tpl.php
index c2db6d3..5ce6d3e 100755
--- a/Theme/Backend/tag-list.tpl.php
+++ b/Theme/Backend/tag-list.tpl.php
@@ -36,7 +36,7 @@ echo $this->data['nav']->render(); ?>
             <?php $count = 0; foreach ($this->data['tags'] as $key => $value) : ++$count;
             $url         = UriFactory::build('{/base}/tag/view?{?}&id=' . $value->id); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><span class="tag" style="background: <?= $this->printHtml(\substr($value->color, 0, 7)); ?>">&nbsp;&nbsp;&nbsp;<?= $value->icon !== null ? '<i class="' . $this->printHtml($value->icon ?? '') . '"></i>' : '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; ?>&nbsp;</span></a>
+                    <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><span class="tag" style="background: <?= $this->printHtml(\substr($value->color, 0, 7)); ?>">&nbsp;&nbsp;&nbsp;<?= $value->icon !== null ? '<i class="g-icon">' . $this->printHtml($value->icon ?? '') . '</i>' : '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; ?>&nbsp;</span></a>
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getL11n()); ?></a>
 
             <?php endforeach; ?>