diff --git a/admin_roles.php b/admin_roles.php
index a7575df..b99ab3d 100644
--- a/admin_roles.php
+++ b/admin_roles.php
@@ -142,8 +142,8 @@ unset($r);
                     <td class="px-4 py-3 text-end">
                         <div class="btn-group btn-group-sm">
                             <?php if (has_permission('roles', 'edit')): ?>
-                            <button class="btn btn-outline-dark" onclick='editRole(<?= htmlspecialchars(json_encode($r), ENT_QUOTES) ?>)'>
-                                <?= h(t($r['is_system'] ? 'View' : 'Edit', $r['is_system'] ? 'عرض' : 'تعديل')) ?>
+                            <button class="btn btn-outline-dark" onclick='editRole(<?= htmlspecialchars(json_encode($r), ENT_QUOTES) ?>)' data-bs-toggle="modal" data-bs-target="#roleModal">
+                                <svg width="16" height="16" fill="currentColor" class="me-1" viewBox="0 0 16 16"><path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/></svg><?= h(t($r['is_system'] ? 'View' : 'Edit', $r['is_system'] ? 'عرض' : 'تعديل')) ?>
                             </button>
                             <?php endif; ?>
                             
@@ -152,7 +152,7 @@ unset($r);
                                 <input type="hidden" name="action" value="delete">
                                 <input type="hidden" name="id" value="<?= h($r['id']) ?>">
                                 <button class="btn btn-outline-danger" type="submit">
-                                    <?= h(t('Delete', 'حذف')) ?>
+                                    <svg width="16" height="16" fill="currentColor" class="me-1" viewBox="0 0 16 16"><path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/><path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/></svg><?= h(t('Delete', 'حذف')) ?>
                                 </button>
                             </form>
                             <?php endif; ?>
@@ -239,10 +239,10 @@ function editRole(role) {
         if (role.permissions) {
             for (let p in role.permissions) {
                 let perms = role.permissions[p];
-                if (perms.can_view) { let el = document.querySelector(`input[name="perms[${p}][view]"]`); if(el) el.checked = true; }
-                if (perms.can_add) { let el = document.querySelector(`input[name="perms[${p}][add]"]`); if(el) el.checked = true; }
-                if (perms.can_edit) { let el = document.querySelector(`input[name="perms[${p}][edit]"]`); if(el) el.checked = true; }
-                if (perms.can_delete) { let el = document.querySelector(`input[name="perms[${p}][delete]"]`); if(el) el.checked = true; }
+                if (perms.can_view == 1) { let el = document.querySelector(`input[name="perms[${p}][view]"]`); if(el) el.checked = true; }
+                if (perms.can_add == 1) { let el = document.querySelector(`input[name="perms[${p}][add]"]`); if(el) el.checked = true; }
+                if (perms.can_edit == 1) { let el = document.querySelector(`input[name="perms[${p}][edit]"]`); if(el) el.checked = true; }
+                if (perms.can_delete == 1) { let el = document.querySelector(`input[name="perms[${p}][delete]"]`); if(el) el.checked = true; }
             }
         }
         
diff --git a/admin_users.php b/admin_users.php
index c58be91..ca73079 100644
--- a/admin_users.php
+++ b/admin_users.php
@@ -183,8 +183,8 @@ $roles_list = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     <td class="px-4 py-3 text-end">
                         <div class="btn-group btn-group-sm">
                             <?php if (has_permission('users', 'edit')): ?>
-                            <button class="btn btn-outline-dark" onclick='editUser(<?= htmlspecialchars(json_encode($u), ENT_QUOTES) ?>)'>
-                                <?= h(t('Edit', 'تعديل')) ?>
+                            <button class="btn btn-outline-dark" onclick='editUser(<?= htmlspecialchars(json_encode($u), ENT_QUOTES) ?>)' data-bs-toggle="modal" data-bs-target="#userModal">
+                                <svg width="16" height="16" fill="currentColor" class="me-1" viewBox="0 0 16 16"><path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/></svg><?= h(t('Edit', 'تعديل')) ?>
                             </button>
                             <?php endif; ?>
                             
@@ -193,7 +193,7 @@ $roles_list = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input type="hidden" name="action" value="delete">
                                 <input type="hidden" name="id" value="<?= h($u['id']) ?>">
                                 <button class="btn btn-outline-danger" type="submit">
-                                    <?= h(t('Delete', 'حذف')) ?>
+                                    <svg width="16" height="16" fill="currentColor" class="me-1" viewBox="0 0 16 16"><path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/><path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/></svg><?= h(t('Delete', 'حذف')) ?>
                                 </button>
                             </form>
                             <?php endif; ?>