diff --git a/Admin/Install/Application/QA/Themes/Default/css/qa-small.css b/Admin/Install/Application/QA/Themes/Default/css/qa-small.css
index 16f93a2..188cca1 100755
--- a/Admin/Install/Application/QA/Themes/Default/css/qa-small.css
+++ b/Admin/Install/Application/QA/Themes/Default/css/qa-small.css
@@ -3,7 +3,7 @@ html, body {
   margin: 0;
   height: 100%;
   max-height: 100%;
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Arial', Helvetica, sans-serif;
 }
 
 body {
diff --git a/Theme/Backend/qa-dashboard.tpl.php b/Theme/Backend/qa-dashboard.tpl.php
index e536881..81518c3 100755
--- a/Theme/Backend/qa-dashboard.tpl.php
+++ b/Theme/Backend/qa-dashboard.tpl.php
@@ -59,7 +59,7 @@ echo $this->data['nav']->render(); ?>
                     <?php $tags = $question->getTags(); foreach ($tags as $tag) :
                         if ($tag->id === 0) { continue; }
                     ?>
-                        <span class="tag"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                        <span class="tag"><?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                     <?php endforeach; ?>
                 </div>
 
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index b70ce3b..f7d6d68 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -73,7 +73,7 @@ echo $this->data['nav']->render();
                             foreach ($tags as $tag) :
                                 if ($tag->id === 0) { continue; }
                         ?>
-                            <span class="tag"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                            <span class="tag"><?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                         <?php endforeach; ?>
                     </div>