diff --git a/powerdnsadmin/templates/base.html b/powerdnsadmin/templates/base.html
index be5c99c..a95737c 100644
--- a/powerdnsadmin/templates/base.html
+++ b/powerdnsadmin/templates/base.html
@@ -123,7 +123,7 @@
                         </li>
                         <li class="{{ 'nav-item active' if active_page == 'admin_history' else 'nav-item' }}">
                             <a href="{{ url_for('admin.history') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-calendar-alt"></i>
+                                <i class="nav-icon fa-solid fa-timeline"></i>
                                 <p>History</p>
                             </a>
                         </li>
@@ -135,7 +135,7 @@
                         </li>
                         <li class="{{ 'nav-item active' if active_page == 'admin_accounts' else 'nav-item' }}">
                             <a href="{{ url_for('admin.manage_account') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-industry"></i>
+                                <i class="nav-icon fa-solid fa-users-rectangle"></i>
                                 <p>Accounts</p>
                             </a>
                         </li>
@@ -163,26 +163,26 @@
                                 {% if active_page == 'admin_settings' %}style="display: block;"{% endif %}>
                                 <li class="nav-item">
                                     <a href="{{ url_for('admin.setting_basic') }}" class="nav-link">
-                                        <i class="nav-icon fa-solid fa-circle"></i>
+                                        <i class="nav-icon fa-solid fa-gears"></i>
                                         <p>Basic</p>
                                     </a>
                                 </li>
                                 <li class="nav-item">
                                     <a href="{{ url_for('admin.setting_records') }}" class="nav-link">
-                                        <i class="nav-icon fa-solid fa-circle"></i>
-                                        <p>Records</p>
+                                        <i class="nav-icon fa-regular fa-rectangle-list"></i>
+                                        <p>Zone Records</p>
                                     </a>
                                 </li>
                                 {% if current_user.role.name == 'Administrator' %}
                                     <li class="nav-item">
                                         <a href="{{ url_for('admin.setting_pdns') }}" class="nav-link">
-                                            <i class="nav-icon fa-solid fa-circle"></i>
-                                            <p>PowerDNS Connection</p>
+                                            <i class="nav-icon fa-solid fa-server"></i>
+                                            <p>Server</p>
                                         </a>
                                     </li>
                                     <li class="nav-item">
                                         <a href="{{ url_for('admin.setting_authentication') }}" class="nav-link">
-                                            <i class="nav-icon fa-solid fa-circle"></i>
+                                            <i class="nav-icon fa-solid fa-user-shield"></i>
                                             <p>Authentication</p>
                                         </a>
                                     </li>
diff --git a/powerdnsadmin/templates/dashboard.html b/powerdnsadmin/templates/dashboard.html
index c6ff50d..9cf0c5f 100755
--- a/powerdnsadmin/templates/dashboard.html
+++ b/powerdnsadmin/templates/dashboard.html
@@ -262,10 +262,6 @@
                 "ordering": true,
                 "columnDefs": [
                     {"orderable": false, "targets": [-1]}
-                    {% if current_user.role.name not in ['Administrator', 'Operator'] %},{
-                        "visible": false,
-                        "targets": [-2]
-                    }{% endif %}
                 ],
                 "processing": true,
                 "serverSide": true,
diff --git a/powerdnsadmin/templates/dashboard_domain.html b/powerdnsadmin/templates/dashboard_domain.html
index 53d1cfe..489fdbc 100644
--- a/powerdnsadmin/templates/dashboard_domain.html
+++ b/powerdnsadmin/templates/dashboard_domain.html
@@ -31,6 +31,8 @@
 {% macro account(domain) %}
     {% if current_user.role.name in ['Administrator', 'Operator'] %}
         {{ domain.account.name if domain.account else 'None' }}
+    {% else %}
+        None
     {% endif %}
 {% endmacro %}