diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index d8fe49ca..c9d092c4 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -13,7 +13,7 @@
     	<title>FLEXTYPE</title>
 
         <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
+        <script src="https://kit.fontawesome.com/588226d8c5.js" crossorigin="anonymous"></script>
 
         {% set admin_build = base_url() ~ '/site/plugins/admin/assets/dist/css/admin-build.min.css' %}
         {% set admin_elegant = base_url() ~ '/site/plugins/admin/assets/dist/css/elegant.css' %}
@@ -167,7 +167,7 @@
                             {% for key, attribute in button.attributes %}
                                 {{ key }} = "{{ attribute }}"
                             {% endfor %}
-                            >{{ button.title }}</a>
+                            >{{ button.title|raw }}</a>
                             {% endif %}
                         {% endfor %}
                     </div>
diff --git a/site/plugins/admin/views/templates/system/settings/index.html b/site/plugins/admin/views/templates/system/settings/index.html
index 035d3850..24733ffa 100644
--- a/site/plugins/admin/views/templates/system/settings/index.html
+++ b/site/plugins/admin/views/templates/system/settings/index.html
@@ -503,16 +503,16 @@
         </div>
         <div class="col-md-1"></div>
         <div class="nav flex-column nav-pills col-md-3" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-            <a class="nav-link active" id="pills-main-tab" data-toggle="pill" href="#pills-site" role="tab" aria-controls="pills-site" aria-selected="true">{{ tr('admin_site') }}</a>
-            <a class="nav-link" id="pills-content-tab" data-toggle="pill" href="#pills-content" role="tab" aria-controls="pills-content" aria-selected="true">{{ tr('admin_content') }}</a>
-            <a class="nav-link" id="pills-media-tab" data-toggle="pill" href="#pills-media" role="tab" aria-controls="pills-media" aria-selected="true">{{ tr('admin_media') }}</a>
-            <a class="nav-link" id="pills-error-tab" data-toggle="pill" href="#pills-error" role="tab" aria-controls="pills-error" aria-selected="true">{{ tr('admin_error_404_page') }}</a>
-            <a class="nav-link" id="pills-twig-tab" data-toggle="pill" href="#pills-twig" role="tab" aria-controls="pills-twig" aria-selected="true">{{ tr('admin_twig_templating') }}</a>
-            <a class="nav-link" id="pills-debugging-tab" data-toggle="pill" href="#pills-debugging" role="tab" aria-controls="pills-debugging" aria-selected="true">{{ tr('admin_debugging') }}</a>
-            <a class="nav-link" id="pills-slim-tab" data-toggle="pill" href="#pills-slim" role="tab" aria-controls="pills-slim" aria-selected="true">{{ tr('admin_slim') }}</a>
-            <a class="nav-link" id="pills-cache-tab" data-toggle="pill" href="#pills-cache" role="tab" aria-controls="pills-cache" aria-selected="true">{{ tr('admin_cache') }}</a>
-            <a class="nav-link" id="pills-slug-tab" data-toggle="pill" href="#pills-slug" role="tab" aria-controls="pills-slug" aria-selected="true">{{ tr('admin_slug') }}</a>
-            <a class="nav-link" id="pills-admin-tab" data-toggle="pill" href="#pills-admin" role="tab" aria-controls="pills-admin" aria-selected="true">{{ tr('admin_admin_panel') }}</a>
+            <a class="nav-link active" id="pills-main-tab" data-toggle="pill" href="#pills-site" role="tab" aria-controls="pills-site" aria-selected="true"><i class="fas fa-globe"></i> {{ tr('admin_site') }}</a>
+            <a class="nav-link" id="pills-content-tab" data-toggle="pill" href="#pills-content" role="tab" aria-controls="pills-content" aria-selected="true"><i class="fas fa-file-alt"></i> {{ tr('admin_content') }}</a>
+            <a class="nav-link" id="pills-media-tab" data-toggle="pill" href="#pills-media" role="tab" aria-controls="pills-media" aria-selected="true"><i class="fas fa-photo-video"></i> {{ tr('admin_media') }}</a>
+            <a class="nav-link" id="pills-error-tab" data-toggle="pill" href="#pills-error" role="tab" aria-controls="pills-error" aria-selected="true"><i class="fas fa-exclamation-circle"></i> {{ tr('admin_error_404_page') }}</a>
+            <a class="nav-link" id="pills-twig-tab" data-toggle="pill" href="#pills-twig" role="tab" aria-controls="pills-twig" aria-selected="true"><i class="fas fa-pencil-ruler"></i> {{ tr('admin_twig_templating') }}</a>
+            <a class="nav-link" id="pills-debugging-tab" data-toggle="pill" href="#pills-debugging" role="tab" aria-controls="pills-debugging" aria-selected="true"><i class="fas fa-tools"></i> {{ tr('admin_debugging') }}</a>
+            <a class="nav-link" id="pills-slim-tab" data-toggle="pill" href="#pills-slim" role="tab" aria-controls="pills-slim" aria-selected="true"><i class="fas fa-cogs"></i> {{ tr('admin_slim') }}</a>
+            <a class="nav-link" id="pills-cache-tab" data-toggle="pill" href="#pills-cache" role="tab" aria-controls="pills-cache" aria-selected="true"><i class="fas fa-clone"></i> {{ tr('admin_cache') }}</a>
+            <a class="nav-link" id="pills-slug-tab" data-toggle="pill" href="#pills-slug" role="tab" aria-controls="pills-slug" aria-selected="true"><i class="fas fa-link"></i> {{ tr('admin_slug') }}</a>
+            <a class="nav-link" id="pills-admin-tab" data-toggle="pill" href="#pills-admin" role="tab" aria-controls="pills-admin" aria-selected="true"><i class="fab fa-fort-awesome"></i> {{ tr('admin_admin_panel') }}</a>
         </div>
     </div>
 </form>