diff --git a/site/plugins/admin/templates/extends/fieldsets/index.html b/site/plugins/admin/templates/extends/fieldsets/index.html
index 8299698c..7e0fc4b0 100644
--- a/site/plugins/admin/templates/extends/fieldsets/index.html
+++ b/site/plugins/admin/templates/extends/fieldsets/index.html
@@ -12,9 +12,9 @@
                     <tr>
                         <td class="w-1 text-center{% if fieldset.hide %}opacity-50{% endif %}">
                             {% 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('far fa-file-alt') }}</i>
                             {% endif %}
                         </td>
                         <td class="pl-0 {% if fieldset.hide %}opacity-50{% endif %}">
@@ -22,23 +22,23 @@
                         </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.fieldsets.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.fieldsets.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-fieldset-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>
                                 <div class="dropdown__divider"></div>
                                 <a class="dropdown__item" href="javascript:;" onclick="event.preventDefault();
                             document.getElementById('delete-fieldset-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-fieldset-id-{{ id }}" action="{{ path_for('admin.fieldsets.deleteProcess') }}" method="POST" style="display: none;">
                                     {{ csrf() }}
@@ -61,4 +61,4 @@
             <a href="{{ path_for('admin.fieldsets.add') }}" class="btn">{{ tr('admin_create_new_fieldset') }}</a>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/system/api/delivery/index.html b/site/plugins/admin/templates/system/api/delivery/index.html
index e00e9267..d31fbc8c 100644
--- a/site/plugins/admin/templates/system/api/delivery/index.html
+++ b/site/plugins/admin/templates/system/api/delivery/index.html
@@ -71,4 +71,4 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/system/tools/cache.html b/site/plugins/admin/templates/system/tools/cache.html
index f2190003..b578dea5 100644
--- a/site/plugins/admin/templates/system/tools/cache.html
+++ b/site/plugins/admin/templates/system/tools/cache.html
@@ -20,12 +20,12 @@
                 </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="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-doctrine').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_clear') }}</a>
                         <form id="clear-id-doctrine" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
@@ -44,12 +44,12 @@
                 </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="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-twig').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_clear') }}</a>
                         <form id="clear-id-twig" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
@@ -68,12 +68,12 @@
                 </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="javascript:;" onclick="event.preventDefault();
                                   document.getElementById('clear-id-glide').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_clear') }}</a>
                         <form id="clear-id-glide" action="{{ path_for('admin.tools.clearCacheProcess') }}" method="POST" style="display: none;">
                             {{ csrf() }}
@@ -84,4 +84,4 @@
             </tr>
         </tbody>
     </table>
-{% endblock %}
\ No newline at end of file
+{% endblock %}