diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 35aabfe..74c945d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -29,7 +29,6 @@ use Modules\Tasks\Models\TaskType;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use Modules\Admin\Models\SettingsEnum as AdminSettingsEnum;
 use Modules\Messages\Models\EmailMapper;
 use Modules\Support\Models\SettingsEnum;
 
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index 1e05608..9893867 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -99,7 +99,10 @@ echo $this->data['nav']->render(); ?>
                             <?php endif; ?>
 
                             <?php foreach ($task->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; ?>
                         </div>
                     </div>
diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php
index c939e40..48ddf76 100755
--- a/Theme/Backend/ticket-create.tpl.php
+++ b/Theme/Backend/ticket-create.tpl.php
@@ -19,26 +19,39 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Ticket'); ?></h1></header>
-            <div class="inner">
-                <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template'); ?>" method="post">
-                    <table class="layout wf-100">
-                        <tbody>
-                        <tr><td><label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
-                        <tr><td><select id="iDepartment" name="department"></select>
-                        <tr><td><label for="iTopic"><?= $this->getHtml('Topic'); ?></label>
-                        <tr><td><select id="iTopic" name="topic"></select>
-                        <tr><td><label for="iTitle"><?= $this->getHtml('Title'); ?></label>
-                        <tr><td><input id="iDescription" name="name" type="text" required>
-                        <tr><td><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td><textarea required></textarea>
-                        <tr><td><label for="iFile"><?= $this->getHtml('Files'); ?></label>
-                        <tr><td><input id="iFile" name="fileVisual" type="file" multiple><input id="iFileHidden" name="files" type="hidden">
-                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-ticket">
-                    </table>
-                </form>
-            </div>
+        <section class="portlet">
+            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template'); ?>" method="post">
+                <div class="portlet-head"><?= $this->getHtml('Ticket'); ?></div>
+                <div class="portlet-body">
+                    <div class="form-group">
+                        <label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
+                        <select id="iDepartment" name="department"></select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iTopic"><?= $this->getHtml('Topic'); ?></label>
+                        <select id="iTopic" name="topic"></select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iTitle"><?= $this->getHtml('Title'); ?></label>
+                        <input id="iTitle" name="name" type="text" required>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iDescription"><?= $this->getHtml('Description'); ?></label>
+                        <textarea required></textarea>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iFile"><?= $this->getHtml('Files'); ?></label>
+                        <input id="iFile" name="fileVisual" type="file" multiple><input id="iFileHidden" name="files" type="hidden">
+                    </div>
+                </div>
+                <div class="portlet-foot">
+                    <input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-ticket">
+                </div>
+            </form>
         </section>
     </div>
 </div>
\ No newline at end of file