diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index b61385c1..760c7b68 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -10,7 +10,7 @@
                     {% else %}
                         {% set _entries = entries.fetch(entry.slug, {}) %}
                         {% set _entries_length = _entries | length %}
-                        {% do 
+                        {% do
                             cache.save(entry.slug ~ '_counter', _entries_length) %}
                     {% endif %}
                     <div class="w-full md:w-3/12 lg:w-2/12 text-center p-4 relative">
@@ -149,7 +149,7 @@
                                 {% else %}
                                     {% set _entries = entries.fetch(entry.slug, {}) %}
                                     {% set _entries_length = _entries | length %}
-                                    {% do 
+                                    {% do
                                         cache.save(entry.slug ~ '_counter', _entries_length) %}
                                 {% endif %}
                                 <a href="{% if _entries_length > 0 %}{{ path_for('admin.entries.index') }}?id={{ entry.slug }}{% else %}{{ path_for('admin.entries.edit') }}?id={{ entry.slug }}&type=editor{% endif %}">
@@ -277,4 +277,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/extends/plugins/index.html b/site/plugins/admin/templates/extends/plugins/index.html
index 8d917c7a..cb083526 100644
--- a/site/plugins/admin/templates/extends/plugins/index.html
+++ b/site/plugins/admin/templates/extends/plugins/index.html
@@ -23,9 +23,9 @@
                     <tr>
                         <td class="w-1 text-center {% if plugin.enabled == false %}opacity-50{% endif %}">
                             {% if plugin.icon %}
-                                <i class="{{ plugin.icon }}"></i>
+                                <i class="icon">{{ icon(plugin.icon) }}</i>
                             {% else %}
-                                <i class="fas fa-plug"></i>
+                                <i class="icon">{{ icon('fas fa-plug') }}</i>
                             {% endif %}
                         </td>
                         <td class="pl-0 {% if plugin.enabled == false %}opacity-50{% endif %}">
@@ -35,26 +35,26 @@
                         <td class="{% if plugin.enabled == false %}opacity-50{% endif %}">{{ plugin.version }}</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.plugins.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.plugins.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>
                                 {% if key == 'admin' or key == 'site' or key == '' %}
                                     <a class="dropdown__item opacity-50" href="javascript:;">
-                                        <i class="fas fa-toggle-on dropdown__icon"></i>
+                                        <i class="icon icon--white mr-3">{{ icon('fas fa-toggle-on') }}</i>
                                         {{ tr('admin_deactivate') }}</a>
                                 {% else %}
                                     <a class="dropdown__item" onclick="event.preventDefault(); document.getElementById('update-plugin-status-{{ key }}').submit();" href="javascript:;">
                                         {% if plugin.enabled %}
-                                            <i class="fas fa-toggle-on dropdown__icon"></i>
+                                            <i class="icon icon--white mr-3">{{ icon('fas fa-toggle-on') }}</i>
                                             {{ tr('admin_deactivate') }}
                                         {% else %}
-                                            <i class="fas fa-toggle-off dropdown__icon"></i>
+                                            <i class="icon icon--white mr-3">{{ icon('fas fa-toggle-off') }}</i>
                                             {{ tr('admin_activate') }}
                                         {% endif %}
                                     </a>
@@ -77,4 +77,4 @@
             <h3>{{ tr('admin_you_have_no_plugins') }}</h3>
         </div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/extends/snippets/index.html b/site/plugins/admin/templates/extends/snippets/index.html
index 36e8d030..1da156bb 100644
--- a/site/plugins/admin/templates/extends/snippets/index.html
+++ b/site/plugins/admin/templates/extends/snippets/index.html
@@ -7,33 +7,33 @@
                 {% for id in snippets_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.snippets.edit') }}?id={{ id }}">{{ id }}</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">
                                 <a class="dropdown__item" href="{{ path_for('admin.snippets.edit') }}?id={{ id }}">
-                                    <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.snippets.rename') }}?id={{ id }}">
-                                    <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-snippet-id-{{ id }}').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 js-snippets-info" href="javascript:;" data-toggle="modal" data-target="#snippetsInfoModal" data-name="{{ id }}">
-                                    <i class="fas fa-code dropdown__icon"></i>
+                                    <i class="icon icon--white mr-3">{{ icon('fas fa-code') }}</i>
                                     {{ tr('admin_embeded_code') }}</a>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                                 document.getElementById('delete-snippet-id-{{ id }}').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="delete-snippet-id-{{ id }}" action="{{ path_for('admin.snippets.deleteProcess') }}" 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 aa8aca0c..27188bce 100644
--- a/site/plugins/admin/templates/extends/themes/index.html
+++ b/site/plugins/admin/templates/extends/themes/index.html
@@ -21,7 +21,7 @@
                                 {% else %}
                                     <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                               document.getElementById('activate-theme-id-{{ key }}').submit();">
-                                        <i class="icon">{{ icon('far fa-star') }}</i>
+                                        <i class="icon icon--white mr-3">{{ icon('far fa-star') }}</i>
                                         {{ tr('admin_activate') }}</a>
                                 {% endif %}
                                 <a class="dropdown__item" href="{{ path_for('admin.themes.information') }}?id={{ key }}">