diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index 70d1bdf4..b61385c1 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -15,35 +15,35 @@
                     {% endif %}
                     <div class="w-full md:w-3/12 lg:w-2/12 text-center p-4 relative">
                         <button type="button" class="js-dropdown-btn" style="top: 16px; right: 16px; position: absolute; z-index: 10; width: 34px; height: 34px;">
-                            <i class="fas fa-ellipsis-h"></i>
+                            <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
                         </button>
                         <div class="js-dropdown dropdown">
                             <a class="dropdown__item" href="{{ path_for('admin.entries.edit') }}?id={{ entry.slug }}&type=editor">
-                                <i class="fas fa-edit dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
                                 {{ tr('admin_edit') }}</a>
                             <a class="dropdown__item" href="javascript:;" onclick="$('.js-add-entry input[name=id]').attr('value', '{{ entry.slug }}');" data-toggle="modal" data-target="#selectEntryTypeModal">
-                                <i class="fas fa-plus-circle dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-plus-circle') }}</i>
                                 {{ tr('admin_add') }}</a>
                             <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                    document.getElementById('duplicate-id-{{ entry.slug }}').submit();">
-                                <i class="fas fa-copy dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-copy') }}</i>
                                 {{ tr('admin_duplicate') }}</a>
                             <a class="dropdown__item" href="{{ path_for('admin.entries.rename') }}?id={{ entry.slug }}">
-                                <i class="fas fa-font dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-font') }}</i>
                                 {{ tr('admin_rename') }}</a>
                             <a class="dropdown__item" href="{{ path_for('admin.entries.move') }}?id={{ entry.slug }}">
-                                <i class="fas fa-angle-double-right dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-angle-double-right') }}</i>
                                 {{ tr('admin_move') }}</a>
                             <a class="dropdown__item" href="{{ base_url() }}/{{ entry.slug }}" target="_blank">
-                                <i class="fas fa-eye dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('fas fa-eye') }}</i>
                                 {{ tr('admin_preview') }}</a>
                             <a class="dropdown__item" href="{{ path_for('admin.entries.type') }}?id={{ entry.slug }}">
-                                <i class="far fa-list-alt dropdown__icon"></i>
+                                <i class="icon icon--white mr-3">{{ icon('far fa-list-alt') }}</i>
                                 {{ tr('admin_type') }}</a>
                             <div class="dropdown__divider"></div>
                             <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                    document.getElementById('delete-id-{{ entry.slug }}').submit();">
-                                <i class="fas fa-trash-alt dropdown__icon"></i>
+                                <i class="icon">{{ icon('fas fa-trash-alt') }}</i>
                                 {{ tr('admin_delete') }}</a>
                             <form id="duplicate-id-{{ entry.slug }}" action="{{ path_for('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
                                 {{ csrf() }}
@@ -132,15 +132,15 @@
                                     {% if filesystem_has(fieldset_path) %}
                                         {% set fieldset = parser_decode(filesystem_read(fieldset_path), 'yaml') %}
                                         {% if fieldset.icon %}
-                                            <i class="{{ fieldset.icon }}"></i>
+                                            <i class="icon">{{ icon(fieldset.icon) }}</i>
                                         {% else %}
-                                            <i class="far fa-file-alt"></i>
+                                            <i class="icon">{{ icon(fieldset.icon) }}</i>
                                         {% endif %}
                                     {% else %}
-                                        <i class="far fa-file-alt"></i>
+                                        <i class="icon">{{ icon(fieldset.icon) }}</i>
                                     {% endif %}
                                 {% else %}
-                                    <i class="far fa-file-alt"></i>
+                                    <i class="icon">{{ icon(fieldset.icon) }}</i>
                                 {% endif %}
                             </td>
                             <td class="pl-0 {% if entry.visibility == 'hidden' or entry.visibility == 'draft' or entry.routable == false %}opacity-50{% endif %}">
@@ -187,35 +187,35 @@
                             </td>
                             <td class="text-right">
                                 <button type="button" class="js-dropdown-btn relative">
-                                    <i class="fas fa-ellipsis-h"></i>
+                                    <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
                                 </button>
                                 <div class="js-dropdown dropdown">
                                     <a class="dropdown__item" href="{{ path_for('admin.entries.edit') }}?id={{ entry.slug }}&type=editor">
-                                        <i class="fas fa-edit dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
                                         {{ tr('admin_edit') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="$('.js-add-entry input[name=id]').attr('value', '{{ entry.slug }}');" data-toggle="modal" data-target="#selectEntryTypeModal">
-                                        <i class="fas fa-plus-circle dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-plus-circle') }}</i>
                                         {{ tr('admin_add') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                            document.getElementById('duplicate-id-{{ entry.slug }}').submit();">
-                                        <i class="fas fa-copy dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-copy') }}</i>
                                         {{ tr('admin_duplicate') }}</a>
                                     <a class="dropdown__item" href="{{ path_for('admin.entries.rename') }}?id={{ entry.slug }}">
-                                        <i class="fas fa-font dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-font') }}</i>
                                         {{ tr('admin_rename') }}</a>
                                     <a class="dropdown__item" href="{{ path_for('admin.entries.move') }}?id={{ entry.slug }}">
-                                        <i class="fas fa-angle-double-right dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-angle-double-right') }}</i>
                                         {{ tr('admin_move') }}</a>
                                     <a class="dropdown__item" href="{{ base_url() }}/{{ entry.slug }}" target="_blank">
-                                        <i class="fas fa-eye dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-eye') }}</i>
                                         {{ tr('admin_preview') }}</a>
                                     <a class="dropdown__item" href="{{ path_for('admin.entries.type') }}?id={{ entry.slug }}">
-                                        <i class="far fa-list-alt dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('far fa-list-alt') }}</i>
                                         {{ tr('admin_type') }}</a>
                                     <div class="dropdown__divider"></div>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                            document.getElementById('delete-id-{{ entry.slug }}').submit();">
-                                        <i class="fas fa-trash-alt dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
                                         {{ tr('admin_delete') }}</a>
                                     <form id="duplicate-id-{{ entry.slug }}" action="{{ path_for('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
                                         {{ csrf() }}
diff --git a/site/plugins/admin/templates/extends/themes/index.html b/site/plugins/admin/templates/extends/themes/index.html
index 5e75cf30..aa8aca0c 100644
--- a/site/plugins/admin/templates/extends/themes/index.html
+++ b/site/plugins/admin/templates/extends/themes/index.html
@@ -6,29 +6,29 @@
             <tbody>
                 {% for key, theme in themes_list %}
                     <tr>
-                        <td class="w-1 text-center">
-                            <i class="fas fa-palette {% if key == registry.settings.theme %}{% else %}opacity-50{% endif %}" aria-hidden="true"></i>
+                        <td class="w-1 text-center {% if key == registry.settings.theme %}{% else %}opacity-50{% endif %}">
+                            <i class="icon">{{ icon('fas fa-palette') }}</i>
                         </td>
                         <td class="pl-0">
                             <a href="{{ path_for('admin.templates.index') }}?theme={{ key }}">{{ theme.name }}</a>
                         </td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn">
-                                <i class="fas fa-ellipsis-h"></i>
+                                <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
                             </button>
                             <div class="js-dropdown dropdown">
                                 {% if key == registry.settings.theme %}
                                 {% else %}
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                               document.getElementById('activate-theme-id-{{ key }}').submit();">
-                                        <i class="far fa-star dropdown__icon"></i>
+                                        <i class="icon">{{ icon('far fa-star') }}</i>
                                         {{ tr('admin_activate') }}</a>
                                 {% endif %}
                                 <a class="dropdown__item" href="{{ path_for('admin.themes.information') }}?id={{ key }}">
-                                    <i class="fas fa-info-circle dropdown__icon"></i>
+                                    <i class="icon icon--white mr-3">{{ icon('fas fa-info-circle') }}</i>
                                     {{ tr('admin_information') }}</a>
                                 <a class="dropdown__item" href="{{ path_for('admin.themes.settings') }}?id={{ key }}">
-                                    <i class="fas fa-cog dropdown__icon"></i>
+                                    <i class="icon icon--white mr-3">{{ icon('fas fa-cog') }}</i>
                                     {{ tr('admin_settings') }}</a>
                                 <form id="activate-theme-id-{{ key }}" action="{{ path_for('admin.themes.activateProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
diff --git a/site/plugins/admin/templates/extends/themes/templates/index.html b/site/plugins/admin/templates/extends/themes/templates/index.html
index c3928f0d..29b36b90 100644
--- a/site/plugins/admin/templates/extends/themes/templates/index.html
+++ b/site/plugins/admin/templates/extends/themes/templates/index.html
@@ -9,7 +9,7 @@
                     {% for template in templates_list %}
                         <tr>
                             <td class="w-1 text-center">
-                                <i class="far fa-file-code"></i>
+                                <i class="icon">{{ icon('far fa-file-code') }}</i>
                             </td>
                             <td class="pl-0">
                                 <a href="{{ path_for('admin.templates.edit') }}?id={{ template.basename }}&type=template&theme={{ theme }}">{{ template.basename }}</a>
@@ -17,23 +17,23 @@
                             <td>{{ tr('admin_template') }}</td>
                             <td class="text-right">
                                 <button type="button" class="js-dropdown-btn">
-                                    <i class="fas fa-ellipsis-h"></i>
+                                    <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
                                 </button>
                                 <div class="js-dropdown dropdown">
                                     <a class="dropdown__item" href="{{ path_for('admin.templates.edit') }}?id={{ template.basename }}&type=template&theme={{ theme }}">
-                                        <i class="fas fa-edit dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
                                         {{ tr('admin_edit') }}</a>
                                     <a class="dropdown__item" href="{{ path_for('admin.templates.rename') }}?id={{ template.basename }}&type=template&theme={{ theme }}">
-                                        <i class="fas fa-font dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-font') }}</i>
                                         {{ tr('admin_rename') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                 document.getElementById('duplicate-template-id-{{ template.basename }}').submit();">
-                                        <i class="fas fa-copy dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-copy') }}</i>
                                         {{ tr('admin_duplicate') }}</a>
                                     <div class="dropdown__divider"></div>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                 document.getElementById('delete-template-id-{{ template.basename }}').submit();">
-                                        <i class="fas fa-trash-alt dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
                                         {{ tr('admin_delete') }}</a>
                                     <form id="duplicate-template-id-{{ template.basename }}" action="{{ path_for('admin.templates.duplicateProcess') }}" method="POST" style="display: none;">
                                         {{ csrf() }}
@@ -64,23 +64,23 @@
                             <td>{{ tr('admin_partial') }}</td>
                             <td class="text-right">
                                 <button type="button" class="js-dropdown-btn">
-                                    <i class="fas fa-ellipsis-h"></i>
+                                    <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
                                 </button>
                                 <div class="js-dropdown dropdown">
                                     <a class="dropdown__item" href="{{ path_for('admin.templates.edit') }}?id={{ partial.basename }}&type=partial&theme={{ theme }}">
-                                        <i class="fas fa-edit dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
                                         {{ tr('admin_edit') }}</a>
                                     <a class="dropdown__item" href="{{ path_for('admin.templates.rename') }}?id={{ partial.basename }}&type=partial&theme={{ theme }}">
-                                        <i class="fas fa-font dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-font') }}</i>
                                         {{ tr('admin_rename') }}</a>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                 document.getElementById('duplicate-partial-id-{{ partial.basename }}').submit();">
-                                        <i class="fas fa-copy dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-copy') }}</i>
                                         {{ tr('admin_duplicate') }}</a>
                                     <div class="dropdown__divider"></div>
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                 document.getElementById('delete-partial-id-{{ partial.basename }}').submit();">
-                                        <i class="fas fa-trash-alt dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
                                         {{ tr('admin_delete') }}</a>
                                     <form id="duplicate-partial-id-{{ partial.basename }}" action="{{ path_for('admin.templates.duplicateProcess') }}" method="POST" style="display: none;">
                                         {{ csrf() }}
diff --git a/site/plugins/admin/templates/system/api/delivery/index.html b/site/plugins/admin/templates/system/api/delivery/index.html
index d2ca9f48..f6651391 100644
--- a/site/plugins/admin/templates/system/api/delivery/index.html
+++ b/site/plugins/admin/templates/system/api/delivery/index.html
@@ -25,7 +25,7 @@
                     {% endif %}
                     <tr>
                         <td class="w-1 text-center {% if token_data.state == 'disabled' %}opacity-50{% endif %}">
-                            <i class="fas fa-truck"></i>
+                            <i class="icon">{{ icon(token_data.icon) }}</i>
                         </td>
                         <td class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
                             <a href="{{ path_for('admin.api_tokens.edit') }}?api={{ api }}&api_token={{ token.dirname }}">{{ token_data.title }}</a>
@@ -42,13 +42,13 @@
                             </button>
                             <div class="js-dropdown dropdown">
                                 <a class="dropdown__item" href="{{ path_for('admin.api_tokens.edit') }}?api={{ api }}&api_token={{ token.dirname }}">
-                                    <i class="dropdown__icon">{{ icon('fas fa-edit') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('fas fa-edit') }}</i>
                                     {{ tr('admin_edit') }}
                                 </a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                           document.getElementById('delete-api-token-id-{{ token.dirname }}').submit();">
-                                    <i class="dropdown__icon">{{ icon('fas fa-trash-alt') }}</i>
+                                    <i class="icon icon--white mr-3">{{ icon('fas fa-trash-alt') }}</i>
                                     {{ tr('admin_delete') }}
                                 </a>
                                 <form id="delete-api-token-id-{{ token.dirname }}" action="{{ path_for('admin.api_tokens.deleteProcess') }}" method="POST" style="display: none;">
diff --git a/site/plugins/admin/templates/system/api/index.html b/site/plugins/admin/templates/system/api/index.html
index 9abb5a9d..dea16aa9 100644
--- a/site/plugins/admin/templates/system/api/index.html
+++ b/site/plugins/admin/templates/system/api/index.html
@@ -15,7 +15,7 @@
                 {% for key, api in api_list %}
                     <tr>
                         <td class="w-1 text-center">
-                            <i class="fas fa-truck"></i>
+                            <i class="icon">{{ icon('fas fa-truck') }}</i>
                         </td>
                         <td>
                             <a href="{{ path_for('admin.api_tokens.index') }}?api={{ key }}">{{ api }}</a>