diff --git a/ui/ui/balance.tpl b/ui/ui/balance.tpl
index 63858031..59c91038 100644
--- a/ui/ui/balance.tpl
+++ b/ui/ui/balance.tpl
@@ -39,7 +39,7 @@
                                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                                     <td>
                                                         <a href="{$_url}services/balance-edit/{$ds['id']}" class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
-                                                        <a href="{$_url}services/balance-delete/{$ds['id']}" onclick="return confirm('{Lang::T('Delete')}?')" id="{$ds['id']}" class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                                        <a href="{$_url}services/balance-delete/{$ds['id']}" onclick="return confirm('{Lang::T('Delete')}?')" id="{$ds['id']}" class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                                     </td>
                                                 </tr>
                                             {/foreach}
diff --git a/ui/ui/bandwidth.tpl b/ui/ui/bandwidth.tpl
index cda79b08..86c1edd4 100644
--- a/ui/ui/bandwidth.tpl
+++ b/ui/ui/bandwidth.tpl
@@ -41,7 +41,7 @@
                                                     <td>{$ds['rate_up']} {$ds['rate_up_unit']}</td>
                                                     <td>
                                                         <a href="{$_url}bandwidth/edit/{$ds['id']}" class="btn btn-sm btn-warning">{Lang::T('Edit')}</a>
-                                                        <a href="{$_url}bandwidth/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-sm" onclick="return confirm('{Lang::T('Delete')}?')" >{Lang::T('Delete')}</a>
+                                                        <a href="{$_url}bandwidth/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-sm" onclick="return confirm('{Lang::T('Delete')}?')" ><i class="glyphicon glyphicon-trash"></i></a>
                                                     </td>
                                                 </tr>
                                             {/foreach}
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index 6e684ef6..f827d875 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -73,7 +73,7 @@
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/pool.tpl b/ui/ui/pool.tpl
index c15e8e9e..da90b528 100644
--- a/ui/ui/pool.tpl
+++ b/ui/ui/pool.tpl
@@ -55,7 +55,7 @@
                                         <a href="{$_url}pool/edit/{$ds['id']}" class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index 6ce4c46c..b2f8e289 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -68,7 +68,7 @@
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}services/pppoe-delete/{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')" id="{$ds['id']}"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl
index 379ddd49..541fc1a5 100644
--- a/ui/ui/prepaid.tpl
+++ b/ui/ui/prepaid.tpl
@@ -65,7 +65,7 @@
                                             class="btn btn-warning btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/radius-nas.tpl b/ui/ui/radius-nas.tpl
index 9e2b6cc8..d7c2b4b5 100644
--- a/ui/ui/radius-nas.tpl
+++ b/ui/ui/radius-nas.tpl
@@ -57,7 +57,7 @@
                                         <a href="{$_url}radius/nas-edit/{$ds['id']}" class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}radius/nas-delete/{$ds['id']}" id="{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/routers.tpl b/ui/ui/routers.tpl
index b01af175..f34d820c 100644
--- a/ui/ui/routers.tpl
+++ b/ui/ui/routers.tpl
@@ -54,7 +54,7 @@
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         <a href="{$_url}routers/delete/{$ds['id']}" id="{$ds['id']}"
                                             onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs">{Lang::T('Delete')}</a>
+                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 631da4b0..50c3a604 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -260,23 +260,29 @@
                             </ul>
                         </li>
                         {$_MENU_AFTER_PAGES}
-                        <li
-                            class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-gear-a"></i> <span>{Lang::T('Settings')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
+                    {/if}
+                    <li
+                        class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-gear-a"></i> <span>{Lang::T('Settings')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                                 <li {if $_routes[1] eq 'app'}class="active" {/if}><a
                                         href="{$_url}settings/app">{Lang::T('General Settings')}</a></li>
                                 <li {if $_routes[1] eq 'localisation'}class="active" {/if}><a
                                         href="{$_url}settings/localisation">{Lang::T('Localisation')}</a></li>
                                 <li {if $_routes[1] eq 'notifications'}class="active" {/if}><a
                                         href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
+                            {/if}
+                            {if in_array($_admin['user_type'],['SuperAdmin','Admin','Agent'])}
                                 <li {if $_routes[1] eq 'users'}class="active" {/if}><a
                                         href="{$_url}settings/users">{Lang::T('Administrator Users')}</a></li>
+                            {/if}
+                            {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                                 <li {if $_routes[1] eq 'dbstatus'}class="active" {/if}><a
                                         href="{$_url}settings/dbstatus">{Lang::T('Backup/Restore')}</a></li>
                                 <li {if $_system_menu eq 'paymentgateway'}class="active" {/if}>
@@ -290,11 +296,13 @@
                                         {Lang::T('Plugin Manager')} <small class="label pull-right">Free</small></a>
                                 </li>
                                 {* <li {if $_routes[0] eq 'codecanyon'}class="active" {/if}>
-                                    <a href="{$_url}codecanyon"><i class="glyphicon glyphicon-shopping-cart"></i>
-                                        Codecanyon.net <small class="label pull-right">Paid</small></a>
-                                </li> *}
-                            </ul>
-                        </li>
+                                <a href="{$_url}codecanyon"><i class="glyphicon glyphicon-shopping-cart"></i>
+                                    Codecanyon.net <small class="label pull-right">Paid</small></a>
+                            </li> *}
+                            {/if}
+                        </ul>
+                    </li>
+                    {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                         {$_MENU_AFTER_SETTINGS}
                         <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
                             <a href="#">
@@ -313,14 +321,14 @@
                             </ul>
                             {$_MENU_LOGS}
                         </li>
-                        {$_MENU_AFTER_LOGS}
-                        <li {if $_system_menu eq 'community'}class="active" {/if}>
-                            <a href="{$_url}community">
-                                <i class="ion ion-chatboxes"></i>
-                                <span class="text">{Lang::T('Community')}</span>
-                            </a>
-                        </li>
                     {/if}
+                    {$_MENU_AFTER_LOGS}
+                    <li {if $_system_menu eq 'community'}class="active" {/if}>
+                        <a href="{$_url}community">
+                            <i class="ion ion-chatboxes"></i>
+                            <span class="text">{Lang::T('Community')}</span>
+                        </a>
+                    </li>
                 </ul>
             </section>
         </aside>
diff --git a/ui/ui/users.tpl b/ui/ui/users.tpl
index a4cd2096..b60a5190 100644
--- a/ui/ui/users.tpl
+++ b/ui/ui/users.tpl
@@ -54,10 +54,10 @@
                                     <td>{Lang::dateTimeFormat($ds['last_login'])}</td>
                                     <td>
                                         <a href="{$_url}settings/users-edit/{$ds['id']}"
-                                            class="btn btn-warning btn-xs">{Lang::T('Edit')}</a>
+                                            class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
                                         {if ($_admin['username']) neq ($ds['username'])}
                                             <a href="{$_url}settings/users-delete/{$ds['id']}" id="{$ds['id']}"
-                                                class="btn btn-danger btn-xs" onclick="return confirm('{Lang::T('Delete')}?')">{Lang::T('Delete')}</a>
+                                                class="btn btn-danger btn-xs" onclick="return confirm('{Lang::T('Delete')}?')"><i class="glyphicon glyphicon-trash"></i></a>
                                         {/if}
                                     </td>
                                 </tr>
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index f58cdfc5..acc80633 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -71,7 +71,7 @@
                                     <td>
                                         <a href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}"
                                             class="btn btn-danger btn-xs"
-                                            onclick="return confirm('{Lang::T('Delete')}?')">{Lang::T('Delete')}</a>
+                                            onclick="return confirm('{Lang::T('Delete')}?')"><i class="glyphicon glyphicon-trash"></i></a>
                                     </td>
                                 </tr>
                             {/foreach}