diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index 07882c16..9de79f4a 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -1,7 +1,7 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-    {% if entries_list | length > 0 %}
+    {% if entries_list | length < 0 %}
         {% if items_view == 'table' %}
             <div class="flex flex-wrap">
                 {% for entry in entries_list %}
@@ -234,10 +234,12 @@
             </table>
         {% endif %}
     {% else %}
-        <div class="empty-list-message">
-            <i class="far fa-newspaper"></i>
-            <h3>{{ tr('admin_you_have_not_created_any_entries_yet') }}</h3>
-            <a href="javascript:;" data-toggle="modal" data-target="#selectEntryTypeModal" class="btn">{{ tr('admin_create_new_entry') }}</a>
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('fas fa-database') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_entries_yet') }}</h3>
+                <a href="javascript:;" data-toggle="modal" data-target="#selectEntryTypeModal" class="button">{{ tr('admin_create_new_entry') }}</a>
+            </div>
         </div>
     {% endif %}
 
diff --git a/site/plugins/admin/templates/extends/fieldsets/index.html b/site/plugins/admin/templates/extends/fieldsets/index.html
index 3c7c1bba..de9fed9d 100644
--- a/site/plugins/admin/templates/extends/fieldsets/index.html
+++ b/site/plugins/admin/templates/extends/fieldsets/index.html
@@ -1,7 +1,7 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-    {% if fieldsets_list | length > 0 %}
+    {% if fieldsets_list | length < 0 %}
         <table class="table">
             <tbody>
                 {% for id, title in fieldsets_list %}
@@ -55,10 +55,12 @@
             </tbody>
         </table>
     {% else %}
-        <div class="empty-list-message">
-            <i class="fas fa-list"></i>
-            <h3>{{ tr('admin_you_have_not_created_any_fieldsets_yet') }}</h3>
-            <a href="{{ path_for('admin.fieldsets.add') }}" class="btn">{{ tr('admin_create_new_fieldset') }}</a>
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('far fa-list-alt') }}</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>
+            </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/plugins/index.html b/site/plugins/admin/templates/extends/plugins/index.html
index 3cdd31e9..895910a1 100644
--- a/site/plugins/admin/templates/extends/plugins/index.html
+++ b/site/plugins/admin/templates/extends/plugins/index.html
@@ -72,9 +72,11 @@
             </tbody>
         </table>
     {% else %}
-        <div class="empty-list-message">
-            <i class="fas fa-list"></i>
-            <h3>{{ tr('admin_you_have_no_plugins') }}</h3>
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('fas fa-plug') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_no_plugins') }}</h3>
+            </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/snippets/index.html b/site/plugins/admin/templates/extends/snippets/index.html
index b3f36b5f..f7818145 100644
--- a/site/plugins/admin/templates/extends/snippets/index.html
+++ b/site/plugins/admin/templates/extends/snippets/index.html
@@ -50,10 +50,12 @@
             </tbody>
         </table>
     {% else %}
-        <div class="empty-list-message">
-            <i class="far fa-file-code"></i>
-            <h3>{{ tr('admin_you_have_not_created_any_snippets_yet') }}</h3>
-            <a href="{{ path_for('admin.snippets.add') }}" class="btn">{{ tr('admin_create_new_snippet') }}</a>
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('far fa-file-code') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_snippets_yet') }}</h3>
+                <a href="{{ path_for('admin.snippets.add') }}" class="button">{{ tr('admin_create_new_snippet') }}</a>
+            </div>
         </div>
     {% endif %}
 
@@ -97,4 +99,4 @@
             $('.js-snippets-php-placeholder').html($(this).attr('data-name'));
         });
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/index.html b/site/plugins/admin/templates/extends/themes/index.html
index df0fac35..cf1fd6f9 100644
--- a/site/plugins/admin/templates/extends/themes/index.html
+++ b/site/plugins/admin/templates/extends/themes/index.html
@@ -42,9 +42,11 @@
             </tbody>
         </table>
     {% else %}
-        <div class="empty-list-message">
-            <i class="fas fa-list"></i>
-            <h3>{{ tr('admin_you_have_no_themes') }}</h3>
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('fas fa-palette') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_no_themes') }}</h3>
+            </div>
         </div>
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/index.html b/site/plugins/admin/templates/extends/themes/templates/index.html
index 60ea0b8b..493b8783 100644
--- a/site/plugins/admin/templates/extends/themes/templates/index.html
+++ b/site/plugins/admin/templates/extends/themes/templates/index.html
@@ -1,7 +1,7 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-    {% if (templates_list | length > 0) 
+    {% if (templates_list | length > 0)
         or(partials_list | length > 0) %}
         <table class="table">
             <tbody>
@@ -102,10 +102,12 @@
             </tbody>
         </table>
     {% else %}
-        <div class="empty-list-message">
-            <i class="fas fa-layer-group"></i>
-            <h3>{{ tr('admin_you_have_not_created_any_templates_yet') }}</h3>
-            <a href="{{ path_for('admin.templates.add') }}" class="btn">{{ tr('admin_create_new_template') }}</a>
-        </div>
+<div class="text-center flex justify-center items-center h-full">
+    <div>
+        <i class="icon icon--4xl">{{ icon('fas fa-layer-group') }}</i>
+        <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_templates_yet') }}</h3>
+        <a href="{{ path_for('admin.templates.add') }}" class="button">{{ tr('admin_create_new_template') }}</a>
+    </div>
+</div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/system/api/delivery/index.html b/site/plugins/admin/templates/system/api/delivery/index.html
index 0d060040..14d68bd0 100644
--- a/site/plugins/admin/templates/system/api/delivery/index.html
+++ b/site/plugins/admin/templates/system/api/delivery/index.html
@@ -63,12 +63,12 @@
             </tbody>
         </table>
     {% else %}
-        <div class="text-center flex justify-center items-center pt-20">
+        <div class="text-center flex justify-center items-center h-full">
             <div>
-                <div class="inline-block text-center w-24 h-24">{{ icon('fas fa-truck') }}</div>
-                <h3 class="text-2xl pt-3 pb-8">{{ tr('admin_you_have_not_created_any_delvery_api_tokens_yet') }}</h3>
+                <i class="icon icon--4xl">{{ icon('fas fa-truck') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_delvery_api_tokens_yet') }}</h3>
                 <a href="{{ path_for('admin.api_tokens.add') }}?api={{api}}" class="button">{{ tr('admin_create_new_delivery_token') }}</a>
             </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/system/api/index.html b/site/plugins/admin/templates/system/api/index.html
index dea16aa9..cddbfcfe 100644
--- a/site/plugins/admin/templates/system/api/index.html
+++ b/site/plugins/admin/templates/system/api/index.html
@@ -25,6 +25,11 @@
             </tbody>
         </table>
     {% else %}
-        {{ include ("plugins/admin/templates/ui/no-elements.html", {icon: 'fas fa-network-wired', message: 'admin_you_have_not_created_any_api_tokens_yet'}) }}
+        <div class="text-center flex justify-center items-center h-full">
+            <div>
+                <i class="icon icon--4xl">{{ icon('fas fa-network-wired') }}</i>
+                <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_api_tokens_yet') }}</h3>
+            </div>
+        </div>
     {% endif %}
 {% endblock %}
\ No newline at end of file