diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dbff65b..cae278f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="1.8.0"></a>
+# [1.8.0](https://github.com/flextype-plugins/admin) (2021-01-07)
+
+### Features
+
+* **core** update code base for new Twig 2.0.0
+* **core** update code base for new Icon 2.0.0
+
 <a name="1.7.1"></a>
 # [1.7.1](https://github.com/flextype-plugins/admin) (2021-01-03)
 
diff --git a/README.md b/README.md
index 5e7d6666..a8f30d43 100755
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@ The following dependencies need to be installed for Form Admin Plugin.
 | Item | Version | Download |
 |---|---|---|
 | [flextype](https://github.com/flextype/flextype) | 0.9.15 | [download](https://github.com/flextype/flextype/releases) |
-| [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
+| [twig](https://github.com/flextype-plugins/twig) | >=2.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 | [form](https://github.com/flextype-plugins/form) | >=1.0.0 | [download](https://github.com/flextype-plugins/form/releases) |
 | [form-admin](https://github.com/flextype-plugins/form-admin) | >=1.0.0 | [download](https://github.com/flextype-plugins/form-admin/releases) |
 | [jquery](https://github.com/flextype-plugins/jquery) | >=1.0.0 | [download](https://github.com/flextype-plugins/jquery/releases) |
-| [icon](https://github.com/flextype-plugins/icon) | >=1.0.0 | [download](https://github.com/flextype-plugins/icon/releases) |
+| [icon](https://github.com/flextype-plugins/icon) | >=2.0.0 | [download](https://github.com/flextype-plugins/icon/releases) |
 | [acl](https://github.com/flextype-plugins/acl) | >=1.0.0 | [download](https://github.com/flextype-plugins/acl/releases) |
 | [accounts-admin](https://github.com/flextype-plugins/accounts-admin) | >=1.0.0 | [download](https://github.com/flextype-plugins/accounts-admin/releases) |
 | [phpmailer](https://github.com/flextype-plugins/phpmailer) | >=1.0.0 | [download](https://github.com/flextype-plugins/phpmailer/releases) |
diff --git a/app/Controllers/ApiAccessController.php b/app/Controllers/ApiAccessController.php
index 83f985db..1234baa6 100644
--- a/app/Controllers/ApiAccessController.php
+++ b/app/Controllers/ApiAccessController.php
@@ -18,15 +18,6 @@
 
 class ApiAccessController
 {
-
-    /**
-     * __construct
-     */
-     public function __construct()
-     {
-
-     }
-
     /**
      * Access Index page
      *
@@ -57,7 +48,7 @@ public function index(Request $request, Response $response) : Response
                         'link' => flextype('router')->pathFor('admin.api.index'),
                         'title' => __('admin_api'),
                     ],
-                    'api_Access' => [
+                    'api_access' => [
                         'link' => flextype('router')->pathFor('admin.api_access.index'),
                         'title' => __('admin_access'),
                         'active' => true
diff --git a/app/Controllers/ApiController.php b/app/Controllers/ApiController.php
index d3f7b15e..52bbf6e8 100644
--- a/app/Controllers/ApiController.php
+++ b/app/Controllers/ApiController.php
@@ -18,14 +18,6 @@
 
 class ApiController
 {
-    /**
-     * __construct
-     */
-     public function __construct()
-     {
-
-     }
-
     /**
      * Index page for API's
      *
@@ -42,27 +34,27 @@ public function index(Request $request, Response $response) : Response
                 'api_list' => [
                                 'entries' => [
                                   'title' => __('admin_entries'),
-                                  'icon' => 'fas fa-database'
+                                  'icon' => ['name' => 'database', 'set' => 'fontawesome|solid'],
                                 ],
                                 'registry' => [
                                   'title' => __('admin_registry'),
-                                  'icon' => 'fas fa-archive'
+                                  'icon' => ['name' => 'archive', 'set' => 'fontawesome|solid'],
                                 ],
                                 'images' => [
                                   'title' => __('admin_images'),
-                                  'icon' => 'far fa-images'
+                                  'icon' => ['name' => 'images', 'set' => 'fontawesome|solid'],
                                 ],
                                 'files' => [
                                   'title' => __('admin_files'),
-                                  'icon' => 'fas fa-file'
+                                  'icon' => ['name' => 'file', 'set' => 'fontawesome|solid'],
                                 ],
                                 'folders' => [
                                   'title' => __('admin_folders'),
-                                  'icon' => 'fas fa-folder'
+                                  'icon' => ['name' => 'folder', 'set' => 'fontawesome|solid'],
                                 ],
                                 'access' => [
                                   'title' => __('admin_access'),
-                                  'icon' => 'fas fa-user-shield'
+                                  'icon' => ['name' => 'user-shield', 'set' => 'fontawesome|solid'],
                                 ],
                                ],
                 'links' =>  [
diff --git a/app/Controllers/ApiFilesController.php b/app/Controllers/ApiFilesController.php
index 422832af..3f657a1d 100644
--- a/app/Controllers/ApiFilesController.php
+++ b/app/Controllers/ApiFilesController.php
@@ -18,15 +18,6 @@
 
 class ApiFilesController
 {
-
-    /**
-     * __construct
-     */
-     public function __construct()
-     {
-
-     }
-
     /**
      * files Index page
      *
diff --git a/app/Controllers/EntriesController.php b/app/Controllers/EntriesController.php
index 0b7ebacb..3b47f973 100644
--- a/app/Controllers/EntriesController.php
+++ b/app/Controllers/EntriesController.php
@@ -997,7 +997,7 @@ public function uploadMediaFileProcess(Request $request, Response $response) : R
      */
     public function getMediaList(string $id, bool $path = false) : array
     {
-        $base_url = \Slim\Http\Uri::createFromEnvironment(new \Slim\Http\Environment($_SERVER))->getBaseUrl();
+        $baseUrl = \Slim\Http\Uri::createFromEnvironment(new \Slim\Http\Environment($_SERVER))->getBaseUrl();
         $files = [];
 
         if (!Filesystem::has(PATH['project'] . '/media/entries/' . $id)) {
@@ -1009,7 +1009,7 @@ public function getMediaList(string $id, bool $path = false) : array
                 if (strpos($file, strtolower($file_ext), 1)) {
                     if ($file !== 'entry.md') {
                         if ($path) {
-                            $files[$base_url . '/' . $id . '/' . $file] = $base_url . '/' . $id . '/' . $file;
+                            $files[$baseUrl . '/' . $id . '/' . $file] = $baseUrl . '/' . $id . '/' . $file;
                         } else {
                             $files[$file] = $file;
                         }
diff --git a/dependencies.php b/dependencies.php
index f90ad82a..a62be1ed 100644
--- a/dependencies.php
+++ b/dependencies.php
@@ -19,10 +19,10 @@
 I18n::$locale = flextype('registry')->get('flextype.settings.locale');
 
 // Add Admin Navigation
-flextype('registry')->set('plugins.admin.settings.navigation.content.entries', ['title' => __('admin_entries'), 'icon' => 'fas fa-database', 'link' => flextype('router')->pathFor('admin.entries.index')]);
-flextype('registry')->set('plugins.admin.settings.navigation.extends.plugins', ['title' => __('admin_plugins'),'icon' => 'fas fa-plug', 'link' => flextype('router')->pathFor('admin.plugins.index')]);
-flextype('registry')->set('plugins.admin.settings.navigation.system.tools', ['title' => __('admin_tools'),'icon' => 'fas fa-toolbox', 'link' => flextype('router')->pathFor('admin.tools.index')]);
-flextype('registry')->set('plugins.admin.settings.navigation.system.api', ['title' => __('admin_api'),'icon' => 'fas fa-network-wired', 'link' => flextype('router')->pathFor('admin.api.index')]);
+flextype('registry')->set('plugins.admin.settings.navigation.content.entries', ['title' => __('admin_entries'), 'icon' => ['name' => 'database', 'set' => 'fontawesome|solid'], 'link' => flextype('router')->pathFor('admin.entries.index')]);
+flextype('registry')->set('plugins.admin.settings.navigation.extends.plugins', ['title' => __('admin_plugins'),'icon' => ['name' => 'plug', 'set' => 'fontawesome|solid'], 'link' => flextype('router')->pathFor('admin.plugins.index')]);
+flextype('registry')->set('plugins.admin.settings.navigation.system.tools', ['title' => __('admin_tools'),'icon' => ['name' => 'toolbox', 'set' => 'fontawesome|solid'], 'link' => flextype('router')->pathFor('admin.tools.index')]);
+flextype('registry')->set('plugins.admin.settings.navigation.system.api', ['title' => __('admin_api'),'icon' => ['name' => 'network-wired', 'set' => 'fontawesome|solid'], 'link' => flextype('router')->pathFor('admin.api.index')]);
 
 /**
  * Add Assets
diff --git a/package.json b/package.json
index 63a3a9e1..2615af60 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Admin",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Admin theme for Flextype",
   "homepage": "https://flextype.org",
   "author": "Sergey Romanenko",
diff --git a/plugin.yaml b/plugin.yaml
index 5e9cc2db..2996ba81 100755
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -1,7 +1,9 @@
 name: Admin
-version: 1.7.1
+version: 1.8.0
 description: Admin Panel plugin for Flextype.
-icon: fab fa-fort-awesome
+icon:
+  name: fort-awesome
+  set: "fontawesome|brands"
 author:
   name: Sergey Romanenko
   email: support@flextype.org
@@ -15,8 +17,8 @@ license: MIT
 
 dependencies:
   flextype: 0.9.15
-  twig: '>=1.0.0'
-  icon: '>=1.0.0'
+  twig: '>=2.0.0'
+  icon: '>=2.0.0'
   form: '>=1.0.0'
   form-admin: '>=1.0.0'
   jquery: '>=1.0.0'
diff --git a/templates/content/entries/add.html b/templates/content/entries/add.html
index 46de66fc..3e1a0bf9 100644
--- a/templates/content/entries/add.html
+++ b/templates/content/entries/add.html
@@ -45,7 +45,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-entry">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-entry" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/content/entries/index.html b/templates/content/entries/index.html
index 6c2f03da..962aee4a 100644
--- a/templates/content/entries/index.html
+++ b/templates/content/entries/index.html
@@ -28,19 +28,19 @@
                                     {% if filesystem().file(fieldset_path).exists() %}
                                         {% set fieldset = flextype.serializers.yaml.decode(filesystem().file(fieldset_path).get()) %}
                                         {% if fieldset.icon %}
-                                            <i class="icon">{{ icon(fieldset.icon) }}</i>
+                                            <i class="icon">{{ icon(fieldset.icon.name, fieldset.icon.set) }}</i>
                                         {% else %}
-                                            <i class="icon">{{ icon('far fa-file-alt') }}</i>
+                                            <i class="icon">{{ icon('file-alt', 'fontawesome|solid') }}</i>
                                         {% endif %}
                                     {% else %}
-                                        <i class="icon">{{ icon('far fa-file-alt') }}</i>
+                                        <i class="icon">{{ icon('file-alt', 'fontawesome|solid') }}</i>
                                     {% endif %}
                                 {% else %}
-                                    <i class="icon">{{ icon('far fa-file-alt') }}</i>
+                                    <i class="icon">{{ icon('file-alt', 'fontawesome|solid') }}</i>
                                 {% endif %}
                             </td>
                             <td class="pl-0 {% if entry.visibility == 'hidden' or entry.visibility == 'draft' or entry.routable == false %}opacity-50{% endif %}">
-                                <a href="{% if entry.has_children %}{{ path_for('admin.entries.index') }}?id={{ entry.id }}{% else %}{{ path_for('admin.entries.edit') }}?id={{ entry.id }}&type=editor{% endif %}">
+                                <a href="{% if entry.has_children %}{{ urlFor('admin.entries.index') }}?id={{ entry.id }}{% else %}{{ urlFor('admin.entries.edit') }}?id={{ entry.id }}&type=editor{% endif %}">
                                     {% if entry.fieldset %}
                                         {% if filesystem().file(fieldset_path).exists() %}
                                             {% if fieldset.default_field %}
@@ -68,41 +68,41 @@
                             </td>
                             <td class="text-right">
                                 <button type="button" class="js-dropdown-btn relative" data-dropdown="dropdown-{{ entry.id }}">
-                                    <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                    <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                                 </button>
                                 <div id="dropdown-{{ entry.id }}" class="dropdown">
-                                    <a class="dropdown__item" href="{{ path_for('admin.entries.edit') }}?id={{ entry.id }}&type=editor">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                    <a class="dropdown__item" href="{{ urlFor('admin.entries.edit') }}?id={{ entry.id }}&type=editor">
+                                        <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_edit') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                     selectEntryType('{{ entry.id }}', {{ loop.index0 }});">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-plus-circle') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('plus-circle', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_add') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                            document.getElementById('duplicate-id-{{ entry.id }}').submit();">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-copy') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('copy', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_duplicate') }}</a>
-                                    <a class="dropdown__item" href="{{ path_for('admin.entries.rename') }}?id={{ entry.id }}">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-font') }}</i>
+                                    <a class="dropdown__item" href="{{ urlFor('admin.entries.rename') }}?id={{ entry.id }}">
+                                        <i class="icon icon--white mr-3">{{ icon('font', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_rename') }}</a>
-                                    <a class="dropdown__item" href="{{ path_for('admin.entries.move') }}?id={{ entry.id }}">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-angle-double-right') }}</i>
+                                    <a class="dropdown__item" href="{{ urlFor('admin.entries.move') }}?id={{ entry.id }}">
+                                        <i class="icon icon--white mr-3">{{ icon('angle-double-right', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_move') }}</a>
-                                    <a class="dropdown__item" href="{{ base_url() }}/{{ entry.id }}" target="_blank">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-eye') }}</i>
+                                    <a class="dropdown__item" href="{{ baseUrl() }}/{{ entry.id }}" target="_blank">
+                                        <i class="icon icon--white mr-3">{{ icon('eye', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_preview') }}</a>
-                                    <a class="dropdown__item" href="{{ path_for('admin.entries.type') }}?id={{ entry.id }}">
-                                        <i class="icon icon--white mr-3">{{ icon('far fa-list-alt') }}</i>
+                                    <a class="dropdown__item" href="{{ urlFor('admin.entries.type') }}?id={{ entry.id }}">
+                                        <i class="icon icon--white mr-3">{{ icon('list-alt', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_type') }}</a>
                                     <div class="dropdown__divider"></div>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteEntry('{{ entry.id }}', {{ loop.index0 }});">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_delete') }}</a>
-                                    <form id="duplicate-id-{{ entry.id }}" action="{{ path_for('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
+                                    <form id="duplicate-id-{{ entry.id }}" action="{{ urlFor('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
                                         {{ csrf() }}
                                         <input type="hidden" name="id" value="{{ entry.id }}">
                                     </form>
-                                    <form id="delete-id-{{ entry.id }}" action="{{ path_for('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
+                                    <form id="delete-id-{{ entry.id }}" action="{{ urlFor('admin.entries.deleteProcess') }}" method="POST" style="display: none;">
                                         {{ csrf() }}
                                         <input type="hidden" name="id" value="{{ entry.id }}">
                                         <input type="hidden" name="id-current" value="{{ id_current }}">
@@ -116,7 +116,7 @@
         {% else %}
             <div class="text-center flex justify-center items-center h-full">
                 <div>
-                    <i class="icon icon--4xl">{{ icon('fas fa-database') }}</i>
+                    <i class="icon icon--4xl">{{ icon('database', 'fontawesome|solid') }}</i>
                     <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_entries_yet') }}</h3>
                     <a href="javascript:;" class="button" onclick="event.preventDefault();
                     selectEntryType('{{ id_current }}', 0);">{{ tr('admin_create_new_entry') }}</a>
@@ -126,9 +126,9 @@ <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_entries_yet
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('far fa-list-alt') }}</i>
+                <i class="icon icon--4xl">{{ icon('list-alt', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_fieldsets_yet') }}</h3>
-                <a href="{{ path_for('admin.fieldsets.add') }}" class="button">{{ tr('admin_create_new_fieldset') }}</a>
+                <a href="{{ urlFor('admin.fieldsets.add') }}" class="button">{{ tr('admin_create_new_fieldset') }}</a>
             </div>
         </div>
     {% endif %}
@@ -141,14 +141,14 @@ <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_fieldsets_y
                 document.getElementById('add-entry-{{ key }}').submit();" class="block bg-gray-000 border-gray-100 border px-4 py-8 relative rounded">
                         <div>
                             {% if fieldset.icon %}
-                                <i class="icon icon--large">{{ icon(fieldset.icon) }}</i>
+                                <i class="icon icon--large">{{ icon(fieldset.icon.name, fieldset.icon.set) }}</i>
                             {% else %}
-                                <i class="icon icon--large">{{ icon('far fa-file-alt') }}</i>
+                                <i class="icon icon--large">{{ icon('file-alt', 'fontawesome|solid') }}</i>
                             {% endif %}
                         </div>
                         <div class="pt-3">{{ fieldset.title }}</div>
                     </a>
-                    <form id="add-entry-{{ key }}" action="{{ path_for('admin.entries.selectEntryTypeProcess') }}" method="POST" style="display: none;" class="js-add-entry">
+                    <form id="add-entry-{{ key }}" action="{{ urlFor('admin.entries.selectEntryTypeProcess') }}" method="POST" style="display: none;" class="js-add-entry">
                         {{ csrf() }}
                         <input type="hidden" name="type" value="{{ key }}">
                         <input type="hidden" name="id" value="{{ id_current }}">
diff --git a/templates/content/entries/media.html b/templates/content/entries/media.html
index 7038ac4e..c1ac1d2c 100644
--- a/templates/content/entries/media.html
+++ b/templates/content/entries/media.html
@@ -9,7 +9,7 @@
 
     <div class="flex row">
         <div class="col w-full">
-            <form method="post" id="form" class="form-inline form-upload" enctype="multipart/form-data" action="{{ path_for('admin.entries.uploadMediaFileProcess') }}">
+            <form method="post" id="form" class="form-inline form-upload" enctype="multipart/form-data" action="{{ urlFor('admin.entries.uploadMediaFileProcess') }}">
                 {{ csrf() }}
                 <input type="hidden" name="entry-id" value="{{ id }}">
                 <div class="form-group bg-gray-000 p-4">
@@ -56,19 +56,19 @@
                     </td>
                     <td class="text-right" style="height: 64px;">
                         <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-{{ index }}">
-                            <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                            <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                         </button>
                         <div id="dropdown-{{ index }}" class="dropdown">
                             <a class="dropdown__item js-snippets-info" href="javascript:;" onclick="event.preventDefault();
                             embededCode('{{ filesystem().file(file).basename() }}', {{ index }});">
-                                <i class="icon icon--white mr-3">{{ icon('fas fa-code') }}</i>
+                                <i class="icon icon--white mr-3">{{ icon('code', 'fontawesome|solid') }}</i>
                                 {{ tr('admin_embeded_code') }}</a>
                             <div class="dropdown__divider"></div>
                             <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                             deleteMedia('{{ index }}', {{ loop.index0 }});">
-                                <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                 {{ tr('admin_delete') }}</a>
-                            <form id="delete-media-file-{{ index }}" action="{{ path_for('admin.entries.deleteMediaFileProcess') }}" method="POST" style="display: none;">
+                            <form id="delete-media-file-{{ index }}" action="{{ urlFor('admin.entries.deleteMediaFileProcess') }}" method="POST" style="display: none;">
                                 {{ csrf() }}
                                 <input type="hidden" name="entry-id" value="{{ id }}">
                                 <input type="hidden" name="media-id" value="{{ filesystem().file(file).basename() }}">
@@ -82,9 +82,9 @@
     {% else %}
     <div class="text-center flex justify-center items-center h-full">
         <div>
-            <i class="icon icon--4xl">{{ icon('fas fa-photo-video') }}</i>
+            <i class="icon icon--4xl">{{ icon('photo-video', 'fontawesome|solid') }}</i>
             <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_upload_any_files_yet') }}</h3>
-            <form method="post" id="form" class="form-inline form-upload" enctype="multipart/form-data" action="{{ path_for('admin.entries.uploadMediaFileProcess') }}">
+            <form method="post" id="form" class="form-inline form-upload" enctype="multipart/form-data" action="{{ urlFor('admin.entries.uploadMediaFileProcess') }}">
                 {{ csrf() }}
                 <input type="hidden" name="entry-id" value="{{ id }}">
                 <div class="button-group flex items-center justify-center">
diff --git a/templates/extends/plugins/index.html b/templates/extends/plugins/index.html
index b0365fd3..1012dfcb 100644
--- a/templates/extends/plugins/index.html
+++ b/templates/extends/plugins/index.html
@@ -26,13 +26,13 @@
                     <tr>
                         <td class="w-1 text-center {% if plugin.settings.enabled == false %}opacity-50{% endif %}">
                             {% if plugin.manifest.icon %}
-                                <i class="icon">{{ icon(plugin.manifest.icon) }}</i>
+                                <i class="icon">{{ icon(plugin.manifest.icon.name, plugin.manifest.icon.set) }}</i>
                             {% else %}
-                                <i class="icon">{{ icon('fas fa-plug') }}</i>
+                                <i class="icon">{{ icon('plug', 'fontawesome|solid') }}</i>
                             {% endif %}
                         </td>
                         <td class="pl-0 {% if plugin.settings.enabled == false %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.plugins.information') }}?id={{ key }}">{{ plugin.manifest.name }}</a>
+                            <a href="{{ urlFor('admin.plugins.information') }}?id={{ key }}">{{ plugin.manifest.name }}</a>
                         </td>
                         <td class="{% if plugin.settings.enabled == false %}opacity-50{% endif %}">{{ plugin.manifest.description }}</td>
                         <td class="{% if plugin.settings.enabled == false %}opacity-50{% endif %}">
@@ -41,28 +41,28 @@
                         <td class="{% if plugin.settings.enabled == false %}opacity-50{% endif %}">{{ plugin.manifest.version }}</td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-{{ key }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-{{ key }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.plugins.information') }}?id={{ key }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-info-circle') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.plugins.information') }}?id={{ key }}">
+                                    <i class="icon icon--white mr-3">{{ icon('info-circle', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_information') }}</a>
-                                <a class="dropdown__item" href="{{ path_for('admin.plugins.settings') }}?id={{ key }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-cog') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.plugins.settings') }}?id={{ key }}">
+                                    <i class="icon icon--white mr-3">{{ icon('cog', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_settings') }}</a>
 
                                 {% if plugin.settings.enabled %}
                                     <a class="dropdown__item" onclick="event.preventDefault(); deactivatePlugin('{{ key }}', {{ loop.index0 }});" href="javascript:;">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-toggle-on') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('toggle-on', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_deactivate') }}
                                     </a>
                                 {% else %}
                                     <a class="dropdown__item" onclick="event.preventDefault(); document.getElementById('update-plugin-status-{{ key }}').submit();" href="javascript:;">
-                                        <i class="icon icon--white mr-3">{{ icon('fas fa-toggle-off') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('toggle-off', 'fontawesome|solid') }}</i>
                                         {{ tr('admin_activate') }}
                                     </a>
                                 {% endif %}
-                                <form id="update-plugin-status-{{ key }}" action="{{ path_for('admin.plugins.update-status') }}" method="POST" style="display: none;">
+                                <form id="update-plugin-status-{{ key }}" action="{{ urlFor('admin.plugins.update-status') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="plugin-key" value="{{ key }}">
                                     <input type="hidden" name="plugin-status" value="{% if plugin.settings.enabled %}true{% else %}false{% endif %}">
@@ -77,7 +77,7 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-plug') }}</i>
+                <i class="icon icon--4xl">{{ icon('plug', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_no_plugins') }}</h3>
             </div>
         </div>
diff --git a/templates/extends/plugins/information.html b/templates/extends/plugins/information.html
index 7a032189..563998c0 100644
--- a/templates/extends/plugins/information.html
+++ b/templates/extends/plugins/information.html
@@ -16,8 +16,12 @@
                 <td>{{ plugin_manifest.description }}</td>
             </tr>
             <tr>
-                <td>{{ tr('admin_icon') }}</td>
-                <td>{{ plugin_manifest.icon }}</td>
+                <td>{{ tr('admin_icon_name') }}</td>
+                <td>{{ plugin_manifest.icon.name }}</td>
+            </tr>
+            <tr>
+                <td>{{ tr('admin_icon_set') }}</td>
+                <td>{{ plugin_manifest.icon.set }}</td>
             </tr>
             <tr>
                 <td>{{ tr('admin_author_name') }}</td>
diff --git a/templates/partials/base.html b/templates/partials/base.html
index 112bc0fb..d85b14ed 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -31,30 +31,30 @@
                 <ul>
                     <li class="navigation__item--logo-wrapper">
                         <a href="javascript:;" class="navigation__item navigation__item--logo navigation__item--flextype-logo relative">
-                            <i class="icon icon--white">{{ icon('fas fa-user-circle') }}</i>
+                            <i class="icon icon--white">{{ icon('user-circle', 'fontawesome|solid') }}</i>
                         </a>
                         <a href="javascript:;" class="navigation__item navigation__item--logo navigation__item--bars-logo hidden relative js-left-nav-dropdown-btn" data-dropdown="dropdown-flextype-menu">
-                            <i class="icon icon--white">{{ icon('fas fa-bars') }}</i>
+                            <i class="icon icon--white">{{ icon('bars', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-flextype-menu" class="dropdown">
                             {% if(flextype.registry.has('plugins.admin.settings.flextype_menu')) %}
                                 {% for flextype_menu in flextype.registry.get('plugins.admin.settings.flextype_menu') %}
                                     <a class="dropdown__item"
                                        target="{% if (flextype_menu.link.is_external) %}_blank{% else %}_self{% endif %}"
-                                       href="{% if (flextype_menu.link.is_external) %}{{ flextype_menu.link.url }}{% else %}{{ path_for(flextype_menu.link.service) }}{% endif %}">
-                                        <i class="icon icon--white mr-3">{{ icon(flextype_menu.link.icon) }}</i>
+                                       href="{% if (flextype_menu.link.is_external) %}{{ flextype_menu.link.url }}{% else %}{{ urlFor(flextype_menu.link.service) }}{% endif %}">
+                                        <i class="icon icon--white mr-3">{{ icon(flextype_menu.link.icon.name, flextype_menu.link.icon.set) }}</i>
                                         {{ tr(flextype_menu.link.title) }}</a>
                                 {% endfor %}
                             {% endif %}
-                            <a class="dropdown__item" href="{{ path_for('admin.settings.index') }}">
-                                <i class="icon icon--white mr-3">{{ icon('fas fa-cog') }}</i>
+                            <a class="dropdown__item" href="{{ urlFor('admin.settings.index') }}">
+                                <i class="icon icon--white mr-3">{{ icon('cog', 'fontawesome|solid') }}</i>
                                 {{ tr('admin_system_settings') }}</a>
                             <div class="dropdown__divider"></div>
                             <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                     document.getElementById('logoutProcess').submit();">
-                                <i class="icon icon--white mr-3">{{ icon('fas fa-sign-out-alt') }}</i>
+                                <i class="icon icon--white mr-3">{{ icon('sign-out-alt', 'fontawesome|solid') }}</i>
                                 {{ tr('admin_logout') }}</a>
-                            <form id="logoutProcess" action="{{ path_for('admin.accounts.logoutProcess') }}" method="POST" style="display: none;">
+                            <form id="logoutProcess" action="{{ urlFor('admin.accounts.logoutProcess') }}" method="POST" style="display: none;">
                                 {{ csrf() }}
                             </form>
                         </div>
@@ -63,7 +63,7 @@
                         {% for key, item in flextype.registry.get('plugins.admin.settings.navigation.content') %}
                             <li>
                                 <a data-tippy-content="{{ item.title|raw }}" href="{{ url() }}{{ item.link|raw }}" class="js-nav navigation__item {% if key == menu_item %}navigation__item--active{% endif %}">
-                                    <i class="icon icon--white">{{ icon(item.icon) }}</i>
+                                    <i class="icon icon--white">{{ icon(item.icon.name, item.icon.set) }}</i>
                                 </a>
                             </li>
                         {% endfor %}
@@ -72,7 +72,7 @@
                         {% for key, item in flextype.registry.get('plugins.admin.settings.navigation.extends') %}
                             <li>
                                 <a data-tippy-content="{{ item.title|raw }}" href="{{ url() }}{{ item.link|raw }}" class="js-nav navigation__item {% if key == menu_item %}navigation__item--active{% endif %}">
-                                    <i class="icon icon--white">{{ icon(item.icon) }}</i>
+                                    <i class="icon icon--white">{{ icon(item.icon.name, item.icon.set) }}</i>
                                 </a>
                             </li>
                         {% endfor %}
@@ -81,7 +81,7 @@
                         {% for key, item in flextype.registry.get('plugins.admin.settings.navigation.system') %}
                             <li>
                                 <a data-tippy-content="{{ item.title|raw }}" href="{{ url() }}{{ item.link|raw }}" class="js-nav navigation__item {% if key == menu_item %}navigation__item--active{% endif %}">
-                                    <i class="icon icon--white">{{ icon(item.icon) }}</i>
+                                    <i class="icon icon--white">{{ icon(item.icon.name, item.icon.set) }}</i>
                                 </a>
                             </li>
                         {% endfor %}
@@ -90,7 +90,7 @@
                         {% for key, item in flextype.registry.get('plugins.admin.settings.navigation.information') %}
                             <li>
                                 <a data-tippy-content="{{ item.title|raw }}" href="{{ item.link|raw }}" class="js-nav navigation__item {% if key == menu_item %}navigation__item--active{% endif %}">
-                                    <i class="icon icon--white">{{ icon(item.icon) }}</i>
+                                    <i class="icon icon--white">{{ icon(item.icon.name, item.icon.set) }}</i>
                                 </a>
                             </li>
                         {% endfor %}
@@ -109,17 +109,17 @@
                         {% endif %}
                     </div>
                     <div class="navigation-top-secondary">
-                        <div class="block w-6/12 {% if is_current_path('admin.entries.index') %}w-4/12{% endif %}">
-                            {% if is_current_path('admin.entries.index') or
-                            is_current_path('admin.entries.edit') or
-                            is_current_path('admin.entries.add') or
-                            is_current_path('admin.entries.move') or
-                            is_current_path('admin.entries.rename') or
-                            is_current_path('admin.entries.type') %}
+                        <div class="block w-6/12 {% if isCurrentUrl('admin.entries.index') %}w-4/12{% endif %}">
+                            {% if isCurrentUrl('admin.entries.index') or
+                            isCurrentUrl('admin.entries.edit') or
+                            isCurrentUrl('admin.entries.add') or
+                            isCurrentUrl('admin.entries.move') or
+                            isCurrentUrl('admin.entries.rename') or
+                            isCurrentUrl('admin.entries.type') %}
                                 {% for part in parts %}
                                     {% set i = i - 1 %}
                                     {% if (part != last) %}
-                                        <a href="{{ path_for('admin.entries.index') }}?id={{ (parts|slice(0, -i))|join('/') }}">
+                                        <a href="{{ urlFor('admin.entries.index') }}?id={{ (parts|slice(0, -i))|join('/') }}">
                                             /
                                             <span class="pr-1 pl-1">{{ part }}</span></a>
                                     {% else %}
@@ -130,147 +130,147 @@
                             {% endif %}
 
 
-                            {% if is_current_path('admin.tools.information') or is_current_path('admin.tools.cache') or is_current_path('admin.tools.registry') %}
+                            {% if isCurrentUrl('admin.tools.information') or isCurrentUrl('admin.tools.cache') or isCurrentUrl('admin.tools.registry') %}
                                 /
                             {% endif %}
 
-                            {% if is_current_path('admin.api.index') %}
+                            {% if isCurrentUrl('admin.api.index') %}
                                 /
                             {% endif %}
 
 
-                            {% if is_current_path('admin.api_files.index') %}
+                            {% if isCurrentUrl('admin.api_files.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_files.index') }}">
+                                <a href="{{ urlFor('admin.api_files.index') }}">
                                     <span class="pr-1 pl-1">files</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_files.edit') %}
+                            {% if isCurrentUrl('admin.api_files.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_files.index') }}">
+                                <a href="{{ urlFor('admin.api_files.index') }}">
                                     <span class="pr-1 pl-1">files</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_files.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_files.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_files.add') %}
+                            {% if isCurrentUrl('admin.api_files.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_files.index') }}">
+                                <a href="{{ urlFor('admin.api_files.index') }}">
                                     <span class="pr-1 pl-1">files</span></a>
                             {% endif %}
 
 
-                            {% if is_current_path('admin.api_folders.index') %}
+                            {% if isCurrentUrl('admin.api_folders.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_folders.index') }}">
+                                <a href="{{ urlFor('admin.api_folders.index') }}">
                                     <span class="pr-1 pl-1">folders</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_folders.edit') %}
+                            {% if isCurrentUrl('admin.api_folders.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_folders.index') }}">
+                                <a href="{{ urlFor('admin.api_folders.index') }}">
                                     <span class="pr-1 pl-1">folders</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_folders.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_folders.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_folders.add') %}
+                            {% if isCurrentUrl('admin.api_folders.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_folders.index') }}">
+                                <a href="{{ urlFor('admin.api_folders.index') }}">
                                     <span class="pr-1 pl-1">folders</span></a>
                             {% endif %}
 
 
 
-                            {% if is_current_path('admin.api_entries.index') %}
+                            {% if isCurrentUrl('admin.api_entries.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_entries.index') }}">
+                                <a href="{{ urlFor('admin.api_entries.index') }}">
                                     <span class="pr-1 pl-1">entries</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_entries.edit') %}
+                            {% if isCurrentUrl('admin.api_entries.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_entries.index') }}">
+                                <a href="{{ urlFor('admin.api_entries.index') }}">
                                     <span class="pr-1 pl-1">entries</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_entries.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_entries.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_entries.add') %}
+                            {% if isCurrentUrl('admin.api_entries.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_entries.index') }}">
+                                <a href="{{ urlFor('admin.api_entries.index') }}">
                                     <span class="pr-1 pl-1">entries</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_registry.index') %}
+                            {% if isCurrentUrl('admin.api_registry.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_registry.index') }}">
+                                <a href="{{ urlFor('admin.api_registry.index') }}">
                                     <span class="pr-1 pl-1">registry</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_registry.edit') %}
+                            {% if isCurrentUrl('admin.api_registry.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_registry.index') }}">
+                                <a href="{{ urlFor('admin.api_registry.index') }}">
                                     <span class="pr-1 pl-1">registry</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_registry.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_registry.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_registry.add') %}
+                            {% if isCurrentUrl('admin.api_registry.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_entries.index') }}">
+                                <a href="{{ urlFor('admin.api_entries.index') }}">
                                     <span class="pr-1 pl-1">registry</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_images.index') %}
+                            {% if isCurrentUrl('admin.api_images.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_images.index') }}">
+                                <a href="{{ urlFor('admin.api_images.index') }}">
                                     <span class="pr-1 pl-1">images</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_images.edit') %}
+                            {% if isCurrentUrl('admin.api_images.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_images.index') }}">
+                                <a href="{{ urlFor('admin.api_images.index') }}">
                                     <span class="pr-1 pl-1">images</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_images.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_images.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_images.add') %}
+                            {% if isCurrentUrl('admin.api_images.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_images.index') }}">
+                                <a href="{{ urlFor('admin.api_images.index') }}">
                                     <span class="pr-1 pl-1">images</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_access.index') %}
+                            {% if isCurrentUrl('admin.api_access.index') %}
                                 /
-                                <a href="{{ path_for('admin.api_access.index') }}">
+                                <a href="{{ urlFor('admin.api_access.index') }}">
                                     <span class="pr-1 pl-1">access</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_access.edit') %}
+                            {% if isCurrentUrl('admin.api_access.edit') %}
                                 /
-                                <a href="{{ path_for('admin.api_access.index') }}">
+                                <a href="{{ urlFor('admin.api_access.index') }}">
                                     <span class="pr-1 pl-1">access</span></a>
                                 /
-                                <a href="{{ path_for('admin.api_access.edit') }}?token={{ token }}">
+                                <a href="{{ urlFor('admin.api_access.edit') }}?token={{ token }}">
                                     <span class="pr-1 pl-1">{{ token }}</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.api_access.add') %}
+                            {% if isCurrentUrl('admin.api_access.add') %}
                                 /
-                                <a href="{{ path_for('admin.api_access.index') }}">
+                                <a href="{{ urlFor('admin.api_access.index') }}">
                                     <span class="pr-1 pl-1">access</span></a>
                             {% endif %}
 
-                            {% if is_current_path('admin.plugins.index') or
-                            is_current_path('admin.plugins.information') or
-                            is_current_path('admin.plugins.settings') %}
+                            {% if isCurrentUrl('admin.plugins.index') or
+                            isCurrentUrl('admin.plugins.information') or
+                            isCurrentUrl('admin.plugins.settings') %}
                                 /
                                 <span class="pr-1 pl-1">{{ id }}</span>
                             {% endif %}
@@ -278,7 +278,7 @@
                             {% block admin_navigation_top_secondary %}{% endblock %}
                         </div>
 
-                        <div class="block w-6/12 {% if is_current_path('admin.entries.index') %}w-4/12{% endif %} text-right">
+                        <div class="block w-6/12 {% if isCurrentUrl('admin.entries.index') %}w-4/12{% endif %} text-right">
                             {% if buttons %}
                                 {% for button in buttons %}
                                     {% if button.type == 'action' %}
diff --git a/templates/partials/modules/slugify.html b/templates/partials/modules/slugify.html
index c1f07491..678d5758 100644
--- a/templates/partials/modules/slugify.html
+++ b/templates/partials/modules/slugify.html
@@ -1,5 +1,5 @@
 <script>
-    {% if (flextype.registry.get('plugins.admin.settings.entries.slugify') == false and is_current_path('admin.entries.add') or is_current_path('admin.entries.rename')) %}
+    {% if (flextype.registry.get('plugins.admin.settings.entries.slugify') == false and isCurrentUrl('admin.entries.add') or isCurrentUrl('admin.entries.rename')) %}
         $("#title").on("keyup change", function () {
             var slug = $("#title").val();
             $("#id").val(slug);
diff --git a/templates/system/api/access/add.html b/templates/system/api/access/add.html
index 8fe17070..d7e575bb 100644
--- a/templates/system/api/access/add.html
+++ b/templates/system/api/access/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/access/index.html b/templates/system/api/access/index.html
index 6f654331..c8c8e994 100644
--- a/templates/system/api/access/index.html
+++ b/templates/system/api/access/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_access.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_access.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-access-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-access-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_access.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_access.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteAccessToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_access.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_access.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -63,9 +63,9 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-user-shield') }}</i>
+                <i class="icon icon--4xl">{{ icon('user-shield', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_access_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_access.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_access.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/api/entries/add.html b/templates/system/api/entries/add.html
index 7efe078d..08f4aab6 100644
--- a/templates/system/api/entries/add.html
+++ b/templates/system/api/entries/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/entries/index.html b/templates/system/api/entries/index.html
index 88625921..87ceef30 100644
--- a/templates/system/api/entries/index.html
+++ b/templates/system/api/entries/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_entries.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_entries.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-entries-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-entries-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_entries.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_entries.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteDeliveryEntriesToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_entries.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_entries.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -63,9 +63,9 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-database') }}</i>
+                <i class="icon icon--4xl">{{ icon('database', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_entries_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_entries.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_entries.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/api/files/add.html b/templates/system/api/files/add.html
index 7efe078d..08f4aab6 100644
--- a/templates/system/api/files/add.html
+++ b/templates/system/api/files/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/files/index.html b/templates/system/api/files/index.html
index ea973a39..8c2bdcae 100644
--- a/templates/system/api/files/index.html
+++ b/templates/system/api/files/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_files.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_files.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-files-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-files-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_files.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_files.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteDeliveryfilesToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_files.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_files.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -63,9 +63,9 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-file') }}</i>
+                <i class="icon icon--4xl">{{ icon('file', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_files_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_files.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_files.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/api/folders/add.html b/templates/system/api/folders/add.html
index 7efe078d..08f4aab6 100644
--- a/templates/system/api/folders/add.html
+++ b/templates/system/api/folders/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/folders/index.html b/templates/system/api/folders/index.html
index 71e5d12e..8049601c 100644
--- a/templates/system/api/folders/index.html
+++ b/templates/system/api/folders/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_folders.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_folders.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-folders-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-folders-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_folders.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_folders.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteDeliveryfoldersToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_folders.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_folders.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -63,9 +63,9 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-folder') }}</i>
+                <i class="icon icon--4xl">{{ icon('folder', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_folders_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_folders.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_folders.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/api/images/add.html b/templates/system/api/images/add.html
index 1fa0fbfd..e47a7e29 100644
--- a/templates/system/api/images/add.html
+++ b/templates/system/api/images/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/images/index.html b/templates/system/api/images/index.html
index d5d9d78a..1f36baa3 100644
--- a/templates/system/api/images/index.html
+++ b/templates/system/api/images/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_images.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_images.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-images-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-images-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_images.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_images.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteImagesToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_images.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_images.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -63,9 +63,9 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('far fa-images') }}</i>
+                <i class="icon icon--4xl">{{ icon('images', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_images_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_images.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_images.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/api/index.html b/templates/system/api/index.html
index 2945740b..b2dc28b8 100644
--- a/templates/system/api/index.html
+++ b/templates/system/api/index.html
@@ -15,10 +15,10 @@
                 {% for key, api in api_list %}
                     <tr>
                         <td class="w-1 text-center">
-                            <i class="icon">{{ icon(api.icon) }}</i>
+                            <i class="icon">{{ icon(api.icon.name, api.icon.set) }}</i>
                         </td>
                         <td>
-                            <a href="{{ path_for('admin.api.index') }}/{{ key }}">{{ api.title }}</a>
+                            <a href="{{ urlFor('admin.api.index') }}/{{ key }}">{{ api.title }}</a>
                         </td>
                     </tr>
                 {% endfor %}
@@ -27,7 +27,7 @@
     {% else %}
         <div class="text-center flex justify-center items-center h-full">
             <div>
-                <i class="icon icon--4xl">{{ icon('fas fa-network-wired') }}</i>
+                <i class="icon icon--4xl">{{ icon('network-wired', 'fontawesome|solid') }}</i>
                 <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_api_tokens_yet') }}</h3>
             </div>
         </div>
diff --git a/templates/system/api/registry/add.html b/templates/system/api/registry/add.html
index 7efe078d..08f4aab6 100644
--- a/templates/system/api/registry/add.html
+++ b/templates/system/api/registry/add.html
@@ -41,7 +41,7 @@
                     <div class="button-dropdown">
                         <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
                         <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
-                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                            <i class="icon icon--white">{{ icon('sort-down', 'fontawesome|solid') }}</i>
                         </a>
                         <div id="dropdown-list-create-new-token" class="dropdown">
                             <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
diff --git a/templates/system/api/registry/index.html b/templates/system/api/registry/index.html
index fb7b96d4..fbea9f20 100644
--- a/templates/system/api/registry/index.html
+++ b/templates/system/api/registry/index.html
@@ -25,10 +25,10 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="icon">{{ icon(token_data.icon) }}</i>
+                            <i class="icon">{{ icon(token_data.icon.name, token_data.icon.set) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.api_registry.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
+                            <a href="{{ urlFor('admin.api_registry.edit') }}?token={{ token.dirname }}">{{ token_data.title }}</a>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token.dirname }}</td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }}
@@ -38,19 +38,19 @@
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-delivery-registry-{{ token.dirname }}">
-                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                                <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                             </button>
                             <div id="dropdown-delivery-registry-{{ token.dirname }}" class="dropdown">
-                                <a class="dropdown__item" href="{{ path_for('admin.api_registry.edit') }}?token={{ token.dirname }}">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
+                                <a class="dropdown__item" href="{{ urlFor('admin.api_registry.edit') }}?token={{ token.dirname }}">
+                                    <i class="icon icon--white mr-3">{{ icon('edit', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault(); deleteDeliveryRegistryToken('{{ token.dirname }}', {{ loop.index0 }});">
-                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
-                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_registry.deleteProcess') }}" method="POST" style="display: none;">
+                                <form id="delete-api-token-id-{{ token.dirname }}" action="{{ urlFor('admin.api_registry.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
                                     <input type="hidden" name="token" value="{{ token.dirname }}">
                                 </form>
@@ -65,7 +65,7 @@
             <div>
                 <i class="icon icon--4xl">{{ icon('fas fa-archive') }}</i>
                 <h3 class="text-2xl pt-5 pb-8">{{ tr('admin_you_have_not_created_any_registry_api_tokens_yet') }}</h3>
-                <a href="{{ path_for('admin.api_registry.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
+                <a href="{{ urlFor('admin.api_registry.add') }}" class="button">{{ tr('admin_create_new_token') }}</a>
             </div>
         </div>
     {% endif %}
diff --git a/templates/system/tools/cache.html b/templates/system/tools/cache.html
index e9db6746..d29257b7 100644
--- a/templates/system/tools/cache.html
+++ b/templates/system/tools/cache.html
@@ -20,14 +20,14 @@
                 </td>
                 <td class="text-right">
                     <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-data">
-                        <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                        <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                     </button>
                     <div id="dropdown-data" class="dropdown">
                         <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-data').submit();">
-                            <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                            <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                             {{ tr('admin_clear') }}</a>
-                        <form id="clear-id-data" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
+                        <form id="clear-id-data" action="{{ urlFor('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
                             <input type="hidden" name="cache-id" value="data">
                         </form>
@@ -44,14 +44,14 @@
                 </td>
                 <td class="text-right">
                     <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-template">
-                        <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                        <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                     </button>
                     <div id="dropdown-template" class="dropdown">
                         <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-twig').submit();">
-                            <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                            <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                             {{ tr('admin_clear') }}</a>
-                        <form id="clear-id-twig" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
+                        <form id="clear-id-twig" action="{{ urlFor('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
                             <input type="hidden" name="cache-id" value="twig">
                         </form>
@@ -68,14 +68,14 @@
                 </td>
                 <td class="text-right">
                     <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-image">
-                        <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                        <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                     </button>
                     <div id="dropdown-image" class="dropdown">
                         <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-preflight').submit();">
-                            <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                            <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                             {{ tr('admin_clear') }}</a>
-                        <form id="clear-id-preflight" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
+                        <form id="clear-id-preflight" action="{{ urlFor('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
                             <input type="hidden" name="cache-id" value="preflight">
                         </form>
@@ -92,14 +92,14 @@
                 </td>
                 <td class="text-right">
                     <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-image">
-                        <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
+                        <i class="icon">{{ icon('ellipsis-h', 'fontawesome|solid') }}</i>
                     </button>
                     <div id="dropdown-image" class="dropdown">
                         <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-glide').submit();">
-                            <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
+                            <i class="icon icon--white mr-3">{{ icon('trash-alt', 'fontawesome|solid') }}</i>
                             {{ tr('admin_clear') }}</a>
-                        <form id="clear-id-glide" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
+                        <form id="clear-id-glide" action="{{ urlFor('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
                             <input type="hidden" name="cache-id" value="glide">
                         </form>