diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs
index aa03d38de..7876f5349 100644
--- a/addons/rose/addon/components/rose/dialog/index.hbs
+++ b/addons/rose/addon/components/rose/dialog/index.hbs
@@ -27,7 +27,7 @@
         title={{@dismissButtonText}}
         {{on "click" (fn this.dismiss @dismiss)}}
       >
-        <Rose::Icon @name="cancel-plain" @size="small" />
+        <Rose::Icon @name="flight/x-16" @size="small" />
       </button>
 
     </header>
@@ -62,7 +62,7 @@
           title={{@dismissButtonText}}
           {{on "click" (fn this.dismiss @dismiss)}}
         >
-          <Rose::Icon @name="cancel-plain" @size="small" />
+          <Rose::Icon @name="flight/x-16" @size="small" />
         </button>
 
       </header>
diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs
index fb4b2ebe0..443829171 100644
--- a/addons/rose/addon/components/rose/form/errors/message/index.hbs
+++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs
@@ -1,4 +1,4 @@
 <p class="rose-form-error-message" ...attributes>
-  <Rose::Icon @name="cancel-square-fill" @size="medium" />
+  <Rose::Icon @name="flight/x-square-16" @size="medium" />
   {{yield}}
 </p>
diff --git a/addons/rose/addon/components/rose/notification/index.hbs b/addons/rose/addon/components/rose/notification/index.hbs
index 04d60df5f..3d9290695 100644
--- a/addons/rose/addon/components/rose/notification/index.hbs
+++ b/addons/rose/addon/components/rose/notification/index.hbs
@@ -26,7 +26,7 @@
       {{on "click" @dismiss}}
     >
       <Rose::Icon
-        @name="cancel-plain"
+        @name="flight/x-16"
         @size="medium" />
       <span class="rose-notification-dismiss-text">
         {{@dismissText}}
diff --git a/addons/rose/addon/components/rose/notification/index.js b/addons/rose/addon/components/rose/notification/index.js
index 881d11355..c3c23b44b 100644
--- a/addons/rose/addon/components/rose/notification/index.js
+++ b/addons/rose/addon/components/rose/notification/index.js
@@ -8,17 +8,17 @@ export default class RoseNotificationComponent extends Component {
    */
   @computed('style')
   get icon() {
-    let icon = 'info-circle-fill';
+    let icon = 'flight/info-16';
 
     switch (this.style) {
       case 'error':
-        icon = 'cancel-square-fill';
+        icon = 'flight/x-square-16';
         break;
       case 'success':
-        icon = 'check-circle-fill';
+        icon = 'flight/check-circle-16';
         break;
       case 'warning':
-        icon = 'alert-triangle';
+        icon = 'flight/alert-triangle-16';
         break;
     }
 
diff --git a/addons/rose/public/flight/alert-triangle-16.svg b/addons/rose/public/flight/alert-triangle-16.svg
new file mode 100644
index 000000000..9367dbd4c
--- /dev/null
+++ b/addons/rose/public/flight/alert-triangle-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.0000000000004547473508864641, 1)">
+  <path d="M7 10C7 9.44771 7.44772 9 8 9L8.00667 9C8.55895 9 9.00667 9.44771 9.00667 10C9.00667 10.5523 8.55895 11 8.00667 11L8 11C7.44772 11 7 10.5523 7 10Z" fill-rule="NONZERO"></path>
+  <path d="M8.75 4.75C8.75 4.33579 8.41421 4 8 4C7.58579 4 7.25 4.33579 7.25 4.75L7.25 7.25C7.25 7.66421 7.58579 8 8 8C8.41421 8 8.75 7.66421 8.75 7.25L8.75 4.75Z" fill-rule="NONZERO"></path>
+  <path d="M6.95256 0.273305C7.27254 0.0940425 7.63327 0 8 0C8.36673 0 8.72746 0.0940425 9.04744 0.273305C9.36743 0.45258 9.63603 0.711147 9.82699 1.02441L9.82916 1.02797L15.7128 10.802C15.8999 11.1244 15.9989 11.4903 16 11.8631C16.001 12.2359 15.904 12.6023 15.7187 12.9257C15.5334 13.2492 15.2665 13.5182 14.945 13.7065C14.6234 13.8948 14.2582 13.9959 13.8856 14L13.8774 14L2.11437 14C1.74181 13.9959 1.3766 13.8948 1.05505 13.7065C0.733464 13.5182 0.466585 13.2492 0.28132 12.9257C0.0960397 12.6023 -0.00104057 12.2359 8.41158e-06 11.8631C0.00105745 11.4903 0.100198 11.1245 0.287291 10.8021L0.293337 10.7916L6.17085 1.02798L6.17301 1.02441C6.36397 0.711147 6.63257 0.45258 6.95256 0.273305ZM7.45469 1.8037L7.45381 1.80515L1.58225 11.5591C1.52856 11.6533 1.50031 11.7595 1.5 11.8673C1.49969 11.9768 1.52818 12.0846 1.58291 12.1802C1.63765 12.2757 1.71684 12.3558 1.81297 12.4121C1.90818 12.4678 2.01654 12.4982 2.12745 12.5L13.8725 12.5C13.9835 12.4982 14.0918 12.4678 14.187 12.4121C14.2832 12.3558 14.3624 12.2757 14.4171 12.1802C14.4718 12.0846 14.5003 11.9768 14.5 11.8673C14.4997 11.7595 14.4714 11.6533 14.4177 11.5591L8.54619 1.80515L8.54531 1.8037C8.48891 1.71174 8.40948 1.63526 8.31429 1.58193C8.21857 1.5283 8.11031 1.5 8 1.5C7.88969 1.5 7.78143 1.5283 7.68571 1.58193C7.59052 1.63526 7.51109 1.71174 7.45469 1.8037Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/info-16.svg b/addons/rose/public/flight/info-16.svg
new file mode 100644
index 000000000..1c7f58c50
--- /dev/null
+++ b/addons/rose/public/flight/info-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="M8 7C8.41421 7 8.75 7.33579 8.75 7.75L8.75 11.25C8.75 11.6642 8.41421 12 8 12C7.58579 12 7.25 11.6642 7.25 11.25L7.25 7.75C7.25 7.33579 7.58579 7 8 7Z" fill-rule="NONZERO"></path>
+  <path d="M8 4C7.44772 4 7 4.44772 7 5C7 5.55228 7.44772 6 8 6L8.00667 6C8.55895 6 9.00667 5.55228 9.00667 5C9.00667 4.44772 8.55895 4 8.00667 4L8 4Z" 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/x-16.svg b/addons/rose/public/flight/x-16.svg
new file mode 100644
index 000000000..f41d39dd5
--- /dev/null
+++ b/addons/rose/public/flight/x-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(3, 3)">
+  <path d="M9.78033 1.28033C10.0732 0.987437 10.0732 0.512563 9.78033 0.21967C9.48744 -0.0732233 9.01256 -0.0732233 8.71967 0.21967L5 3.93934L1.28033 0.21967C0.987437 -0.0732233 0.512563 -0.0732233 0.21967 0.21967C-0.0732233 0.512563 -0.0732233 0.987437 0.21967 1.28033L3.93934 5L0.21967 8.71967C-0.0732233 9.01256 -0.0732233 9.48744 0.21967 9.78033C0.512563 10.0732 0.987437 10.0732 1.28033 9.78033L5 6.06066L8.71967 9.78033C9.01256 10.0732 9.48744 10.0732 9.78033 9.78033C10.0732 9.48744 10.0732 9.01256 9.78033 8.71967L6.06066 5L9.78033 1.28033Z" fill-rule="NONZERO"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/addons/rose/public/flight/x-square-16.svg b/addons/rose/public/flight/x-square-16.svg
new file mode 100644
index 000000000..9bf270d7e
--- /dev/null
+++ b/addons/rose/public/flight/x-square-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(1.25, 1.25)">
+  <path d="M10.0303 3.46967C10.3232 3.76256 10.3232 4.23744 10.0303 4.53033L7.81066 6.75L10.0303 8.96967C10.3232 9.26256 10.3232 9.73744 10.0303 10.0303C9.73744 10.3232 9.26256 10.3232 8.96967 10.0303L6.75 7.81066L4.53033 10.0303C4.23744 10.3232 3.76256 10.3232 3.46967 10.0303C3.17678 9.73744 3.17678 9.26256 3.46967 8.96967L5.68934 6.75L3.46967 4.53033C3.17678 4.23744 3.17678 3.76256 3.46967 3.46967C3.76256 3.17678 4.23744 3.17678 4.53033 3.46967L6.75 5.68934L8.96967 3.46967C9.26256 3.17678 9.73744 3.17678 10.0303 3.46967Z" fill-rule="NONZERO"></path>
+  <path d="M0 2.08333C0 0.93274 0.93274 0 2.08333 0L11.4167 0C12.5673 0 13.5 0.93274 13.5 2.08333L13.5 11.4167C13.5 12.5673 12.5673 13.5 11.4167 13.5L2.08333 13.5C0.93274 13.5 0 12.5673 0 11.4167L0 2.08333ZM2.08333 1.5C1.76117 1.5 1.5 1.76117 1.5 2.08333L1.5 11.4167C1.5 11.7388 1.76117 12 2.08333 12L11.4167 12C11.7388 12 12 11.7388 12 11.4167L12 2.08333C12 1.76117 11.7388 1.5 11.4167 1.5L2.08333 1.5Z" fill-rule="EVENODD"></path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs
index e0bf5a1e5..7413d948e 100644
--- a/ui/admin/app/templates/application.hbs
+++ b/ui/admin/app/templates/application.hbs
@@ -100,7 +100,7 @@
     <Rose::Dialog
       @heading={{t 'titles.abandon-confirm'}}
       @dismissButtonText={{t 'actions.cancel'}}
-      @icon='alert-triangle'
+      @icon='flight/alert-triangle-16'
       @style='warning'
       @modal={{true}}
       @dismiss={{deny}}
@@ -126,7 +126,7 @@
         (t 'actions.confirm')
       }}
       @dismissButtonText={{t 'actions.cancel'}}
-      @icon='alert-triangle'
+      @icon='flight/alert-triangle-16'
       @style='warning'
       @modal={{true}}
       @dismiss={{deny}}
diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs
index c7f3fbccc..caab00131 100644
--- a/ui/desktop/app/templates/application.hbs
+++ b/ui/desktop/app/templates/application.hbs
@@ -21,7 +21,7 @@
       <header.utilities as |utilities|>
         {{#if this.isWindowsOS}}
           <Rose::Button
-            @iconOnly='cancel-plain'
+            @iconOnly='flight/x-16'
             @style='warning'
             class='button-window-close'
             {{on 'click' (route-action 'close')}}
@@ -107,7 +107,7 @@
     <Rose::Dialog
       @heading={{t 'states.error'}}
       @dismissButtonText={{t 'actions.ok'}}
-      @icon='cancel-square-fill'
+      @icon='flight/x-square-16'
       @style='error'
       @modal={{true}}
       @dismiss={{deny}}
@@ -134,7 +134,7 @@
     <Rose::Dialog
       @heading={{t 'actions.confirm'}}
       @dismissButtonText={{t 'actions.cancel'}}
-      @icon='alert-triangle'
+      @icon='flight/alert-triangle-16'
       @style='warning'
       @modal={{true}}
       @dismiss={{deny}}