diff --git a/site/fieldsets/about.yaml b/site/fieldsets/about.yaml
index af218667..a7b676c6 100644
--- a/site/fieldsets/about.yaml
+++ b/site/fieldsets/about.yaml
@@ -1,5 +1,6 @@
 title: About
 default_field: title
+icon: 'far fa-file-alt'
 sections:
   main:
     title: Main
@@ -37,11 +38,7 @@ sections:
       menu_item_target:
         title: admin_menu_item_target
         type: select
-        options:
-          _self: _self
-          _blank: _blank
-          _parent: _parent
-          _top: _top
+        options: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
         size: 4/12
       menu_item_order:
         title: admin_menu_item_order
diff --git a/site/fieldsets/blog-post.yaml b/site/fieldsets/blog-post.yaml
index 4e501d59..b2a79655 100644
--- a/site/fieldsets/blog-post.yaml
+++ b/site/fieldsets/blog-post.yaml
@@ -1,5 +1,6 @@
-title: Blog Post
+title: 'Blog Post'
 default_field: title
+icon: 'far fa-file-alt'
 sections:
   main:
     title: Main
diff --git a/site/fieldsets/blog.yaml b/site/fieldsets/blog.yaml
index cd7a9b9a..23882c3e 100644
--- a/site/fieldsets/blog.yaml
+++ b/site/fieldsets/blog.yaml
@@ -1,5 +1,6 @@
 title: Blog
 default_field: title
+icon: 'far fa-newspaper'
 sections:
   main:
     title: Main
@@ -33,11 +34,7 @@ sections:
       menu_item_target:
         title: admin_menu_item_target
         type: select
-        options:
-          _self: _self
-          _blank: _blank
-          _parent: _parent
-          _top: _top
+        options: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
         size: 4/12
       menu_item_order:
         title: admin_menu_item_order
diff --git a/site/fieldsets/default.yaml b/site/fieldsets/default.yaml
index a1a09f69..73210456 100644
--- a/site/fieldsets/default.yaml
+++ b/site/fieldsets/default.yaml
@@ -1,5 +1,6 @@
 title: Default
 default_field: title
+icon: 'far fa-file-alt'
 sections:
   main:
     title: Main
diff --git a/site/fieldsets/gallery-item.yaml b/site/fieldsets/gallery-item.yaml
index 72574760..169843dc 100644
--- a/site/fieldsets/gallery-item.yaml
+++ b/site/fieldsets/gallery-item.yaml
@@ -1,5 +1,6 @@
-title: Gallery Item
+title: 'Gallery Item'
 default_field: title
+icon: 'far fa-image'
 sections:
   main:
     title: Main
diff --git a/site/fieldsets/gallery.yaml b/site/fieldsets/gallery.yaml
index c2180ace..319d917a 100644
--- a/site/fieldsets/gallery.yaml
+++ b/site/fieldsets/gallery.yaml
@@ -1,5 +1,6 @@
 title: Gallery
 default_field: title
+icon: 'far fa-images'
 sections:
   main:
     title: Main
@@ -29,11 +30,7 @@ sections:
       menu_item_target:
         title: admin_menu_item_target
         type: select
-        options:
-          _self: _self
-          _blank: _blank
-          _parent: _parent
-          _top: _top
+        options: { _self: _self, _blank: _blank, _parent: _parent, _top: _top }
         size: 4/12
       menu_item_order:
         title: admin_menu_item_order
diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html
index 27054757..ed352ff1 100644
--- a/site/plugins/admin/views/templates/content/entries/index.html
+++ b/site/plugins/admin/views/templates/content/entries/index.html
@@ -7,20 +7,35 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th>{{ tr('admin_entry') }}</th>
+            <th colspan="2">{{ tr('admin_entry') }}</th>
             <th></th>
         </tr>
     </thead>
     <tbody>
         {% for entry in entries_list %}
            <tr>
-               <td>
+               <td style="width: 50px; text-align:center;">
+                   {% if entry.fieldset %}
+                       {% set fieldset_path = PATH_FIELDSETS ~ '/' ~ entry.fieldset ~ '.yaml' %}
+                       {% if filesystem_has(fieldset_path) %}
+                           {% set fieldset = yaml_decode(filesystem_read(fieldset_path)) %}
+                           {% if fieldset.icon %}
+                               <i class="{{ fieldset.icon }}"></i>
+                           {% else %}
+                               <i class="far fa-file-alt"></i>
+                           {% endif %}
+                       {% else %}
+                           <i class="far fa-file-alt"></i>
+                       {% endif %}
+                   {% else %}
+                       <i class="far fa-file-alt"></i>
+                   {% endif %}
+               </td>
+               <td style="padding-left:0px;">
                    {% set _entries = entries.fetchAll(entry.slug, {'order_by': {field: 'slug', direction: 'asc'}}) %}
                    <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 %}">
                        {% if entry.fieldset %}
-                           {% set fieldset_path = PATH_FIELDSETS ~ '/' ~ entry.fieldset ~ '.yaml' %}
                            {% if filesystem_has(fieldset_path) %}
-                               {% set fieldset = yaml_decode(filesystem_read(fieldset_path)) %}
                                {% if fieldset.default_field %}
                                    {% if entry[fieldset.default_field] != '' %}
                                        {{ entry[fieldset.default_field] }}
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/index.html b/site/plugins/admin/views/templates/extends/fieldsets/index.html
index c940cd66..95cd2bcb 100644
--- a/site/plugins/admin/views/templates/extends/fieldsets/index.html
+++ b/site/plugins/admin/views/templates/extends/fieldsets/index.html
@@ -5,14 +5,27 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th>{{ tr('admin_name') }}</th>
+            <th colspan="2">{{ tr('admin_name') }}</th>
             <th></th>
         </tr>
     </thead>
     <tbody>
         {% for id, title in fieldsets_list %}
         <tr>
-            <td>
+            <td style="width: 50px; text-align:center;">
+                {% set fieldset_path = PATH_FIELDSETS ~ '/' ~ id ~ '.yaml' %}
+                {% if filesystem_has(fieldset_path) %}
+                    {% set fieldset = yaml_decode(filesystem_read(fieldset_path)) %}
+                    {% if fieldset.icon %}
+                        <i class="{{ fieldset.icon }}"></i>
+                    {% else %}
+                        <i class="far fa-file-alt"></i>
+                    {% endif %}
+                {% else %}
+                    <i class="far fa-file-alt"></i>
+                {% endif %}
+            </td>
+            <td style="padding-left:0px;">
                 <a href="{{ path_for('admin.fieldsets.edit') }}?id={{ id }}">{{ title }}</a>
             </td>
             <td class="text-right">