diff --git a/addons/rose/public/flight/arrow-right-circle-16.svg b/addons/rose/public/flight/arrow-right-circle-16.svg
new file mode 100644
index 000000000..24003e7de
--- /dev/null
+++ b/addons/rose/public/flight/arrow-right-circle-16.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 0)">
+  <path d="M8.24549 4.69505C7.939 4.97368 7.91641 5.44802 8.19505 5.75451L9.55458 7.25L4.75 7.25C4.33579 7.25 4 7.58579 4 8C4 8.41421 4.33579 8.75 4.75 8.75L9.55459 8.75L8.19505 10.2455C7.91641 10.552 7.939 11.0263 8.24549 11.305C8.55199 11.5836 9.02633 11.561 9.30495 11.2545L11.805 8.50451C12.065 8.21844 12.065 7.78157 11.805 7.4955L9.30495 4.7455C9.02633 4.43901 8.55199 4.41642 8.24549 4.69505Z" fill-rule="NONZERO"></path>
+  <path d="M0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8ZM8 1.5C4.41015 1.5 1.5 4.41015 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/collections-16.svg b/addons/rose/public/flight/collections-16.svg
new file mode 100644
index 000000000..cb96ffef0
--- /dev/null
+++ b/addons/rose/public/flight/collections-16.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 1)">
+  <path d="M3.05005 3.75005C3.05005 3.36345 3.36345 3.05005 3.75005 3.05005L7.25005 3.05005C7.63665 3.05005 7.95005 3.36345 7.95005 3.75005C7.95005 4.13665 7.63665 4.45005 7.25005 4.45005L3.75005 4.45005C3.36345 4.45005 3.05005 4.13665 3.05005 3.75005Z" fill-rule="NONZERO"></path>
+  <path d="M3.75005 6.05005C3.36345 6.05005 3.05005 6.36345 3.05005 6.75005C3.05005 7.13665 3.36345 7.45005 3.75005 7.45005L6.25005 7.45005C6.63665 7.45005 6.95005 7.13665 6.95005 6.75005C6.95005 6.36345 6.63665 6.05005 6.25005 6.05005L3.75005 6.05005Z" fill-rule="NONZERO"></path>
+  <path d="M0 2.25C0 1.00736 1.00736 0 2.25 0L8.75 0C9.63343 0 10.3979 0.509141 10.7661 1.25L11.75 1.25C12.4481 1.25 13.0507 1.65876 13.3316 2.25L14.25 2.25C15.2165 2.25 16 3.0335 16 4L16 10C16 10.9665 15.2165 11.75 14.25 11.75L13.3316 11.75C13.0507 12.3412 12.4481 12.75 11.75 12.75L10.7661 12.75C10.3979 13.4909 9.63343 14 8.75 14L2.25 14C1.00736 14 0 12.9926 0 11.75L0 2.25ZM13.5 10.25L14.25 10.25C14.3881 10.25 14.5 10.1381 14.5 10L14.5 4C14.5 3.86193 14.3881 3.75 14.25 3.75L13.5 3.75L13.5 10.25ZM11 11.25L11 2.75L11.75 2.75C11.8881 2.75 12 2.86193 12 3L12 11C12 11.1381 11.8881 11.25 11.75 11.25L11 11.25ZM2.25 1.5C1.83579 1.5 1.5 1.83579 1.5 2.25L1.5 11.75C1.5 12.1642 1.83579 12.5 2.25 12.5L8.75 12.5C9.16421 12.5 9.5 12.1642 9.5 11.75L9.5 2.25C9.5 1.83579 9.16421 1.5 8.75 1.5L2.25 1.5Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/crosshair-16.svg b/addons/rose/public/flight/crosshair-16.svg
new file mode 100644
index 000000000..facad35a7
--- /dev/null
+++ b/addons/rose/public/flight/crosshair-16.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 0)">
+  <path d="M0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8ZM8.75 14.4572L8.75 12.75C8.75 12.3358 8.41421 12 8 12C7.58579 12 7.25 12.3358 7.25 12.75L7.25 14.4572C4.2595 14.1136 1.88638 11.7405 1.5428 8.75L3.25 8.75C3.66421 8.75 4 8.41421 4 8C4 7.58579 3.66421 7.25 3.25 7.25L1.5428 7.25C1.88638 4.2595 4.2595 1.88638 7.25 1.5428L7.25 3.25C7.25 3.66421 7.58579 4 8 4C8.41421 4 8.75 3.66421 8.75 3.25L8.75 1.5428C11.7405 1.88638 14.1136 4.2595 14.4572 7.25L12.75 7.25C12.3358 7.25 12 7.58579 12 8C12 8.41421 12.3358 8.75 12.75 8.75L14.4572 8.75C14.1136 11.7405 11.7405 14.1136 8.75 14.4572Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/folder-users-16.svg b/addons/rose/public/flight/folder-users-16.svg
new file mode 100644
index 000000000..bb81c2b6c
--- /dev/null
+++ b/addons/rose/public/flight/folder-users-16.svg
@@ -0,0 +1,9 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 1)">
+  <path d="M2.25 1.5C1.83579 1.5 1.5 1.83579 1.5 2.25L1.5 11.75C1.5 12.1642 1.83579 12.5 2.25 12.5L2.5 12.5C2.91421 12.5 3.25 12.8358 3.25 13.25C3.25 13.6642 2.91421 14 2.5 14L2.25 14C1.00736 14 0 12.9926 0 11.75L0 2.25C0 1.00736 1.00736 0 2.25 0L6.62868 0C7.22542 0 7.79771 0.237052 8.21967 0.659009L9.34099 1.78033C9.48164 1.92098 9.67241 2 9.87132 2L13.75 2C14.9926 2 16 3.00736 16 4.25L16 9.5C16 9.91421 15.6642 10.25 15.25 10.25C14.8358 10.25 14.5 9.91421 14.5 9.5L14.5 4.25C14.5 3.83579 14.1642 3.5 13.75 3.5L9.87132 3.5C9.27458 3.5 8.70229 3.26295 8.28033 2.84099L7.15901 1.71967C7.01836 1.57902 6.82759 1.5 6.62868 1.5L2.25 1.5Z" fill-rule="NONZERO"></path>
+  <path d="M4.5742 10.7608C4.95662 10.2972 5.50974 9.99992 6.125 9.99992L8.875 9.99992C9.49026 9.99992 10.0434 10.2972 10.4258 10.7608C10.8048 11.2202 11 11.8173 11 12.4166L11 13.2499C11 13.6641 10.6642 13.9999 10.25 13.9999C9.83579 13.9999 9.5 13.6641 9.5 13.2499L9.5 12.4166C9.5 12.1318 9.40543 11.881 9.26874 11.7154C9.13544 11.5538 8.98909 11.4999 8.875 11.4999L6.125 11.4999C6.01091 11.4999 5.86456 11.5538 5.73126 11.7154C5.59457 11.881 5.5 12.1318 5.5 12.4166L5.5 13.2499C5.5 13.6641 5.16421 13.9999 4.75 13.9999C4.33579 13.9999 4 13.6641 4 13.2499L4 12.4166C4 11.8173 4.19516 11.2202 4.5742 10.7608Z" fill-rule="NONZERO"></path>
+  <path d="M7.5 4.49992C6.11929 4.49992 5 5.61921 5 6.99992C5 8.38063 6.11929 9.49992 7.5 9.49992C8.88071 9.49992 10 8.38063 10 6.99992C10 5.61921 8.88071 4.49992 7.5 4.49992ZM6.5 6.99992C6.5 6.44764 6.94772 5.99992 7.5 5.99992C8.05228 5.99992 8.5 6.44764 8.5 6.99992C8.5 7.55221 8.05228 7.99992 7.5 7.99992C6.94772 7.99992 6.5 7.55221 6.5 6.99992Z" fill-rule="EVENODD"></path>
+  <path d="M11.5175 10.5888C11.6065 10.1843 12.0066 9.92846 12.4111 10.0174C12.9776 10.142 13.5 10.4275 13.8854 10.8509C14.273 11.2768 14.4995 11.82 14.5 12.3975L14.5 13.2499C14.5 13.6641 14.1642 13.9999 13.75 13.9999C13.3358 13.9999 13 13.6641 13 13.2499L13 12.3985C12.9998 12.2211 12.9313 12.0311 12.776 11.8605C12.6184 11.6873 12.3806 11.5466 12.0889 11.4824C11.6844 11.3934 11.4285 10.9934 11.5175 10.5888Z" fill-rule="NONZERO"></path>
+  <path d="M11.4194 4.51931C11.0159 4.42575 10.6129 4.67701 10.5194 5.08052C10.4258 5.48403 10.6771 5.88698 11.0806 5.98054C11.3631 6.04604 11.6 6.1919 11.7616 6.38035C11.9218 6.56727 12 6.78558 12 6.99992C12 7.21426 11.9218 7.43258 11.7616 7.6195C11.6 7.80795 11.3631 7.9538 11.0806 8.01931C10.6771 8.11287 10.4258 8.51582 10.5194 8.91933C10.6129 9.32284 11.0159 9.5741 11.4194 9.48054C11.9951 9.34706 12.5188 9.04094 12.9004 8.59568C13.2834 8.14889 13.5 7.5878 13.5 6.99992C13.5 6.41204 13.2834 5.85096 12.9004 5.40416C12.5188 4.9589 11.9951 4.65279 11.4194 4.51931Z" fill-rule="NONZERO"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/identity-user-16.svg b/addons/rose/public/flight/identity-user-16.svg
new file mode 100644
index 000000000..47cb2ba13
--- /dev/null
+++ b/addons/rose/public/flight/identity-user-16.svg
@@ -0,0 +1,7 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 0)">
+  <path d="M5.18658 10.482C5.59146 10.1608 6.11043 10 6.625 10L9.375 10C9.88957 10 10.4085 10.1608 10.8134 10.482C11.2227 10.8067 11.5 11.2893 11.5 11.8409L11.5 12.25C11.5 12.6642 11.1642 13 10.75 13C10.3358 13 10 12.6642 10 12.25L10 11.8409C10 11.8139 9.9876 11.7415 9.88112 11.6571C9.77028 11.5691 9.58978 11.5 9.375 11.5L6.625 11.5C6.41022 11.5 6.22972 11.5691 6.11888 11.6571C6.0124 11.7415 6 11.8139 6 11.8409L6 12.25C6 12.6642 5.66421 13 5.25 13C4.83579 13 4.5 12.6642 4.5 12.25L4.5 11.8409C4.5 11.2893 4.77733 10.8067 5.18658 10.482Z" fill-rule="NONZERO"></path>
+  <path d="M8 4.5C6.61929 4.5 5.5 5.61929 5.5 7C5.5 8.38071 6.61929 9.5 8 9.5C9.38071 9.5 10.5 8.38071 10.5 7C10.5 5.61929 9.38071 4.5 8 4.5ZM7 7C7 6.44772 7.44772 6 8 6C8.55228 6 9 6.44772 9 7C9 7.55228 8.55228 8 8 8C7.44772 8 7 7.55228 7 7Z" fill-rule="EVENODD"></path>
+  <path d="M5.25 0C4.55964 0 4 0.559644 4 1.25L4 2L2.25 2C1.00736 2 0 3.00736 0 4.25L0 12.75C0 13.9926 1.00736 15 2.25 15L13.75 15C14.9926 15 16 13.9926 16 12.75L16 4.25C16 3.00736 14.9926 2 13.75 2L12 2L12 1.25C12 0.559644 11.4404 0 10.75 0L5.25 0ZM11.7501 3.5C11.522 3.80361 11.159 4 10.75 4L5.25 4C4.84105 4 4.47796 3.80361 4.24991 3.5L2.25 3.5C1.83579 3.5 1.5 3.83579 1.5 4.25L1.5 12.75C1.5 13.1642 1.83579 13.5 2.25 13.5L13.75 13.5C14.1642 13.5 14.5 13.1642 14.5 12.75L14.5 4.25C14.5 3.83579 14.1642 3.5 13.75 3.5L11.7501 3.5ZM10.5 2.5L5.5 2.5L5.5 1.5L10.5 1.5L10.5 2.5Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/key-16.svg b/addons/rose/public/flight/key-16.svg
new file mode 100644
index 000000000..e3ec42abd
--- /dev/null
+++ b/addons/rose/public/flight/key-16.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0, 0)">
+  <path d="M9.16056 3.65704C9.58654 3.23151 10.1528 3 10.751 3C11.0485 3 11.3395 3.05908 11.612 3.17258C12.4511 3.5224 13 4.33629 13 5.25086C13 5.842 12.7592 6.41721 12.3441 6.83547C11.9201 7.26261 11.3505 7.49738 10.751 7.49738C9.8364 7.49738 9.02252 6.949 8.67253 6.11008L8.67156 6.10773C8.32456 5.26797 8.51206 4.30267 9.16056 3.65704ZM10.2204 4.7185C10.3628 4.5762 10.5468 4.5 10.751 4.5C10.8481 4.5 10.9435 4.51908 11.0353 4.55729C11.3199 4.67606 11.5 4.94665 11.5 5.25086C11.5 5.44046 11.4197 5.6375 11.2794 5.77881C11.1394 5.9199 10.9541 5.99738 10.751 5.99738C10.4467 5.99738 10.1763 5.81755 10.0574 5.53372C9.9409 5.25051 10.005 4.93276 10.2191 4.71983L10.2204 4.7185Z" fill-rule="EVENODD"></path>
+  <path d="M10.354 0C10.1065 0 9.85329 0.0155692 9.60207 0.0501868C7.86804 0.282588 6.31732 1.32627 5.44802 2.84602C4.65676 4.22923 4.49408 5.89619 4.98199 7.40085L0.219727 12.1621C0.0790398 12.3027 0 12.4935 0 12.6925L0 15.25C0 15.6642 0.335786 16 0.75 16L3.29663 16C3.49552 16 3.68626 15.921 3.8269 15.7804L4.48238 15.125C4.48828 15.1191 4.49409 15.1131 4.4998 15.107C4.69363 14.8998 4.80195 14.6282 4.79346 14.3406L4.79346 13.7005L5.34077 13.7005C5.65062 13.7005 5.95859 13.5779 6.18447 13.3457L6.19164 13.3381C6.39604 13.122 6.51598 12.8402 6.52227 12.5368L6.52243 12.5212L6.52243 11.9811L7.19756 11.9811C7.48581 11.9811 7.76423 11.8635 7.96545 11.6541L8.60299 11.0167C9.16582 11.1998 9.75188 11.2938 10.3494 11.2938C11.3323 11.2938 12.3009 11.0357 13.1538 10.5488C14.6726 9.6815 15.7161 8.13035 15.9507 6.39709L15.9508 6.39596C16.1827 4.66226 15.5853 2.89224 14.349 1.65366C13.2832 0.58803 11.8613 0 10.354 0ZM9.80571 1.5363C9.98331 1.51177 10.1682 1.5 10.354 1.5C11.4639 1.5 12.5039 1.9303 13.2881 2.71402C14.194 3.62172 14.634 4.9255 14.4641 6.19653C14.2919 7.46799 13.5221 8.6111 12.41 9.24619C11.7829 9.60423 11.0705 9.79379 10.3494 9.79379C9.7948 9.79379 9.25365 9.6839 8.73891 9.46834C8.69292 9.44908 8.64512 9.43445 8.59623 9.42467L8.57339 9.42011C8.52498 9.41043 8.47573 9.40556 8.42636 9.40556C8.21589 9.40556 8.04304 9.4859 7.9204 9.58433C7.89914 9.60139 7.87883 9.6196 7.85956 9.63887L7.01714 10.4811L5.9734 10.4811C5.44162 10.4811 5.02243 10.9139 5.02243 11.4321L5.02243 12.2005L4.24442 12.2005C3.71289 12.2005 3.29346 12.6331 3.29346 13.1515L3.29346 14.1926L2.98602 14.5L1.5 14.5L1.5 13.0032L6.35525 8.14897C6.57446 7.92976 6.66613 7.5822 6.52863 7.26074C6.03109 6.07613 6.11336 4.7038 6.75006 3.59079C7.38777 2.47592 8.53147 1.70671 9.8025 1.53674L9.80571 1.5363Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/lock-16.svg b/addons/rose/public/flight/lock-16.svg
new file mode 100644
index 000000000..5b5dba1c1
--- /dev/null
+++ b/addons/rose/public/flight/lock-16.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(2, 0)">
+  <path d="M6 9.25C6.41421 9.25 6.75 9.58579 6.75 10L6.75 11C6.75 11.4142 6.41421 11.75 6 11.75C5.58579 11.75 5.25 11.4142 5.25 11L5.25 10C5.25 9.58579 5.58579 9.25 6 9.25Z" fill-rule="NONZERO"></path>
+  <path d="M2 5.01373L2 4.08333C2 3.00641 2.41693 1.96988 3.1649 1.20274C3.9135 0.434943 4.93292 0 6 0C7.06708 0 8.0865 0.434943 8.8351 1.20274C9.58307 1.96988 10 3.00641 10 4.08333L10 5.01373C11.125 5.13809 12 6.09186 12 7.25L12 12.75C12 13.9926 10.9926 15 9.75 15L2.25 15C1.00736 15 0 13.9926 0 12.75L0 7.25C0 6.09186 0.875012 5.13809 2 5.01373ZM4.2389 2.24989C4.70929 1.76744 5.34317 1.5 6 1.5C6.65683 1.5 7.29071 1.76744 7.7611 2.24989C8.23211 2.73298 8.5 3.39215 8.5 4.08333L8.5 5L3.5 5L3.5 4.08333C3.5 3.39215 3.76789 2.73298 4.2389 2.24989ZM9.75 6.5C10.1642 6.5 10.5 6.83579 10.5 7.25L10.5 12.75C10.5 13.1642 10.1642 13.5 9.75 13.5L2.25 13.5C1.83579 13.5 1.5 13.1642 1.5 12.75L1.5 7.25C1.5 6.83579 1.83579 6.5 2.25 6.5L9.75 6.5Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/users-16.svg b/addons/rose/public/flight/users-16.svg
new file mode 100644
index 000000000..0648faa9f
--- /dev/null
+++ b/addons/rose/public/flight/users-16.svg
@@ -0,0 +1,8 @@
+<svg viewBox="0 0 16 16" width="16" height="16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0.5, 2)">
+  <path d="M5.5 0C3.567 0 2 1.567 2 3.5C2 5.433 3.567 7 5.5 7C7.433 7 9 5.433 9 3.5C9 1.567 7.433 0 5.5 0ZM3.5 3.5C3.5 2.39543 4.39543 1.5 5.5 1.5C6.60457 1.5 7.5 2.39543 7.5 3.5C7.5 4.60457 6.60457 5.5 5.5 5.5C4.39543 5.5 3.5 4.60457 3.5 3.5Z" fill-rule="EVENODD"></path>
+  <path d="M3.75 8C1.67893 8 0 9.67893 0 11.75L0 12.25C0 12.6642 0.335786 13 0.75 13C1.16421 13 1.5 12.6642 1.5 12.25L1.5 11.75C1.5 10.5074 2.50736 9.5 3.75 9.5L7.25 9.5C8.49264 9.5 9.5 10.5074 9.5 11.75L9.5 12.25C9.5 12.6642 9.83579 13 10.25 13C10.6642 13 11 12.6642 11 12.25L11 11.75C11 9.67893 9.32107 8 7.25 8L3.75 8Z" fill-rule="NONZERO"></path>
+  <path d="M10.75 8.75C10.75 8.33579 11.0858 8 11.5 8L11.75 8C13.5449 8 15 9.45507 15 11.25L15 12.25C15 12.6642 14.6642 13 14.25 13C13.8358 13 13.5 12.6642 13.5 12.25L13.5 11.25C13.5 10.2835 12.7165 9.5 11.75 9.5L11.5 9.5C11.0858 9.5 10.75 9.16421 10.75 8.75Z" fill-rule="NONZERO"></path>
+  <path d="M10.7728 0.239086C10.387 0.0884058 9.95202 0.279037 9.80134 0.664871C9.65066 1.05071 9.84129 1.48564 10.2271 1.63632C10.9734 1.92775 11.5 2.65342 11.5 3.50023C11.5 4.34704 10.9734 5.07271 10.2271 5.36415C9.84129 5.51483 9.65066 5.94976 9.80134 6.33559C9.95202 6.72143 10.387 6.91206 10.7728 6.76138C12.0752 6.25274 13 4.9854 13 3.50023C13 2.01506 12.0752 0.747718 10.7728 0.239086Z" fill-rule="NONZERO"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs
index 8385f4759..f896df85a 100644
--- a/ui/admin/app/templates/scopes/scope.hbs
+++ b/ui/admin/app/templates/scopes/scope.hbs
@@ -58,13 +58,13 @@
         <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
           <nav.link @route="scopes.scope.groups">
             <Rose::Icon
-              @name="app-icons/group"
+              @name="flight/folder-users-16"
               @size="medium" />
             {{t "resources.group.title_plural"}}
           </nav.link>
           <nav.link @route="scopes.scope.roles">
             <Rose::Icon
-              @name="app-icons/roles"
+              @name="flight/identity-user-16"
               @size="medium" />
             {{t "resources.role.title_plural"}}
           </nav.link>
@@ -72,20 +72,20 @@
         --}}
         <Rose::Nav::Sidebar @title={{t 'titles.resources'}} as |nav|>
           <nav.link @route='scopes.scope.sessions'>
-            <Rose::Icon @name='app-icons/action-session' @size='medium' />
+            <Rose::Icon @name='flight/arrow-right-circle-16' @size='medium' />
             {{t 'resources.session.title_plural'}}
           </nav.link>
           <nav.link @route='scopes.scope.targets'>
-            <Rose::Icon @name='app-icons/target' @size='medium' />
+            <Rose::Icon @name='flight/crosshair-16' @size='medium' />
             {{t 'resources.target.title_plural'}}
           </nav.link>
           <nav.link @route='scopes.scope.host-catalogs'>
-            <Rose::Icon @name='app-icons/host-catalogs' @size='medium' />
+            <Rose::Icon @name='flight/collections-16' @size='medium' />
             {{t 'resources.host-catalog.title_plural'}}
           </nav.link>
           {{#if (feature-flag 'credential-store')}}
             <nav.link @route='scopes.scope.credential-stores'>
-              <Rose::Icon @name='app-icons/credentials' @size='medium' />
+              <Rose::Icon @name='flight/key-16' @size='medium' />
               {{t 'resources.credential-store.title_plural'}}
             </nav.link>
           {{/if}}
@@ -95,19 +95,19 @@
       {{#unless @model.isProject}}
         <Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
           <nav.link @route='scopes.scope.users'>
-            <Rose::Icon @name='app-icons/users' @size='medium' />
+            <Rose::Icon @name='flight/users-16' @size='medium' />
             {{t 'resources.user.title_plural'}}
           </nav.link>
           <nav.link @route='scopes.scope.groups'>
-            <Rose::Icon @name='app-icons/group' @size='medium' />
+            <Rose::Icon @name='flight/folder-users-16' @size='medium' />
             {{t 'resources.group.title_plural'}}
           </nav.link>
           <nav.link @route='scopes.scope.roles'>
-            <Rose::Icon @name='app-icons/roles' @size='medium' />
+            <Rose::Icon @name='flight/identity-user-16' @size='medium' />
             {{t 'resources.role.title_plural'}}
           </nav.link>
           <nav.link @route='scopes.scope.auth-methods'>
-            <Rose::Icon @name='app-icons/auth-method' @size='medium' />
+            <Rose::Icon @name='flight/lock-16' @size='medium' />
             {{t 'resources.auth-method.title_plural'}}
           </nav.link>
         </Rose::Nav::Sidebar>
diff --git a/ui/admin/app/templates/scopes/scope/-sidebar.hbs b/ui/admin/app/templates/scopes/scope/-sidebar.hbs
index 3b06e303e..f592804ce 100644
--- a/ui/admin/app/templates/scopes/scope/-sidebar.hbs
+++ b/ui/admin/app/templates/scopes/scope/-sidebar.hbs
@@ -1,18 +1,18 @@
 <Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
   <nav.link @route='scopes.scope.users'>
-    <Rose::Icon @name='app-icons/users' @size='medium' />
+    <Rose::Icon @name='flight/users-16' @size='medium' />
     {{t 'resources.user.title_plural'}}
   </nav.link>
   <nav.link @route='scopes.scope.groups'>
-    <Rose::Icon @name='app-icons/group' @size='medium' />
+    <Rose::Icon @name='flight/folder-users-16' @size='medium' />
     {{t 'resources.group.title_plural'}}
   </nav.link>
   <nav.link @route='scopes.scope.roles'>
-    <Rose::Icon @name='app-icons/roles' @size='medium' />
+    <Rose::Icon @name='flight/identity-user-16' @size='medium' />
     {{t 'resources.role.title_plural'}}
   </nav.link>
   <nav.link @route='scopes.scope.auth-methods'>
-    <Rose::Icon @name='app-icons/auth-method' @size='medium' />
+    <Rose::Icon @name='flight/lock-16' @size='medium' />
     {{t 'resources.auth-method.title_plural'}}
   </nav.link>
 </Rose::Nav::Sidebar>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index d97fc2fd0..e1844e23b 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -36,7 +36,7 @@
                     'session-status-'
                     sessionAggregate.session.status
                   }}
-                  @name='app-icons/action-session'
+                  @name='flight/arrow-right-circle-16'
                   @size='medium'
                 />
                 <Copyable
diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs
index 4c68c45ca..f3bde26b8 100644
--- a/ui/desktop/app/templates/scopes/scope/projects.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects.hbs
@@ -2,12 +2,12 @@
   <sidebarLayout.sidebar>
     <Rose::Nav::Sidebar as |nav|>
       <nav.link @route='scopes.scope.projects.targets'>
-        <Rose::Icon @name='app-icons/target' @size='medium' />
+        <Rose::Icon @name='flight/crosshair-16' @size='medium' />
         {{t 'resources.target.title_plural'}}
       </nav.link>
 
       <nav.link @route='scopes.scope.projects.sessions'>
-        <Rose::Icon @name='app-icons/action-session' @size='medium' />
+        <Rose::Icon @name='flight/arrow-right-circle-16' @size='medium' />
         {{t 'resources.session.title_plural'}}
       </nav.link>
     </Rose::Nav::Sidebar>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
index 58abacbc3..5aeffbf98 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
@@ -29,7 +29,7 @@
               <row.headerCell class='nowrap'>
                 <Rose::Icon
                   class={{concat 'session-status-' model.status}}
-                  @name='app-icons/action-session'
+                  @name='flight/arrow-right-circle-16'
                   @size='medium'
                 />
                 <Copyable
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
index d15907de9..c75dee578 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs
@@ -44,7 +44,7 @@
                     credential.library.name
                     (concat ' (' credential.library.name ')')
                   }}'
-                  @icon='app-icons/credential'
+                  @icon='flight/key-16'
                 >
                   <:header>
                     <Rose::Dropdown
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
index 46d8dfad6..6fde4530c 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs
@@ -17,7 +17,7 @@
           <row.cell class='nowrap'>
             <Rose::Icon
               class={{concat 'session-status-' session.status}}
-              @name='app-icons/action-session'
+              @name='flight/arrow-right-circle-16'
               @size='medium'
             />
             <Copyable