diff --git a/client/public/stylesheets/layout.css b/client/public/stylesheets/layout.css
index b4b4ddbc..8de7e858 100644
--- a/client/public/stylesheets/layout.css
+++ b/client/public/stylesheets/layout.css
@@ -58,8 +58,32 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	display:block !important;
 }
 
-.content #unit-control-panel {
-	position: static;
+#unit-control-panel #loadout-container {
+	display:flex;
+	flex-wrap: wrap;
+	row-gap: 4px;
+}
+
+#unit-control-panel #loadout-label span {
+	display:block;
+	float:right;
+}
+
+#unit-control-panel #loadout-label span::before {
+	content: url( /images/icons/fuel.svg );
+	display:inline-block;
+	filter:invert(100%);
+	height:16px;
+	translate:-25% 5%;
+	width:16px;
+}
+
+#unit-control-panel #loadout-label span::after {
+	content: attr( data-fuel-level ) "%";
+}
+
+#unit-control-panel #loadout-container .loadout-item {
+	background-color: black;
 }
 
 dl.data-grid {
@@ -219,7 +243,7 @@ dl.data-grid dd.br-info[data-bearing][data-distance][data-distance-units]::after
 }
 
 #mouse-info-panel dt#ref-measure-position::after {
-	background-image: url( "/images/unit.png" );
+	background-image: url( "/images/icons/ruler.svg" );
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 	background-size:16px 16px;
diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index 5c4a4bf6..395773b8 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -64,6 +64,7 @@ button[disabled="disabled"] {
 
 
 .pill {
+    background-color: var( --background-darksteel );
     border-radius: var(--border-radius-sm);
     padding: 2px 6px;
     width: fit-content;
@@ -71,6 +72,12 @@ button[disabled="disabled"] {
 
 
 
+.loadout-item::after {
+    content: attr( data-qty ) 'x ' attr( data-item );
+}
+
+
+
 .ol-panel {
     background-color: var(--background-steel);
     border-radius: 15px;
@@ -194,7 +201,7 @@ button[disabled="disabled"] {
     padding: 6px 2px;
     text-align: left;
     white-space: nowrap;
-    width: fit-content;
+    width: 100%;
 }
 
 .ol-select>.ol-select-options>div button:hover {
@@ -652,5 +659,3 @@ body[data-hide-naval] #unit-visibility-control-naval {
 .toggle-input:checked ~ .toggle-fill::after {
     transform: translateX(var(--height));
 }
-
- 
\ No newline at end of file
diff --git a/client/public/stylesheets/units.css b/client/public/stylesheets/units.css
index 9d762ce6..2a743efb 100644
--- a/client/public/stylesheets/units.css
+++ b/client/public/stylesheets/units.css
@@ -24,14 +24,14 @@ div.unit:not( .no-function ) {
     cursor:pointer;
 }
 
-[data-hide-aircraft] div.unit-air,
-[data-hide-ground] div.unit-ground,
-[data-hide-sam] div.unit-sam,
-[data-hide-threat] div.unit-threat,
-[data-hide-naval] div.unit-naval,
-[data-hide-blue] div.unit[data-coalition="blue"],
-[data-hide-red] div.unit[data-coalition="red"],
-[data-hide-neutral] div.unit[data-coalition="neutral"] {
+[data-hide-aircraft] #map-container div.unit-air,
+[data-hide-ground] #map-container div.unit-ground,
+[data-hide-sam] #map-container div.unit-sam,
+[data-hide-threat] #map-container div.unit-threat,
+[data-hide-naval] #map-container div.unit-naval,
+[data-hide-blue] #map-container div.unit[data-coalition="blue"],
+[data-hide-red] #map-container div.unit[data-coalition="red"],
+[data-hide-neutral] #map-container div.unit[data-coalition="neutral"] {
     display:none;
 }
 
diff --git a/client/public/themes/olympus/images/icons_actions_gas_dark.svg b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
new file mode 100644
index 00000000..feee9f86
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.9375 4.62549C0.9375 3.6001 1.75781 2.75049 2.8125 2.75049H7.5C8.52539 2.75049 9.375 3.6001 9.375 4.62549V10.2505H9.60938C11.0156 10.2505 12.1875 11.4224 12.1875 12.8286V13.7661C12.1875 14.1763 12.4805 14.4692 12.8906 14.4692C13.2715 14.4692 13.5938 14.1763 13.5938 13.7661V9.25439C12.7734 9.04932 12.1875 8.31689 12.1875 7.43799V5.56299L11.25 4.62549C10.9863 4.39111 10.9863 3.95166 11.25 3.68799C11.4844 3.45361 11.9238 3.45361 12.1875 3.68799L14.4434 5.97314C14.7949 6.32471 15 6.79346 15 7.2915V7.67236V8.37549V9.31299V13.7661C15 14.938 14.0332 15.8755 12.8906 15.8755C11.7188 15.8755 10.7812 14.938 10.7812 13.7661V12.8286C10.7812 12.1841 10.2539 11.6567 9.60938 11.6567H9.375V15.8755C9.87305 15.8755 10.3125 16.3149 10.3125 16.813C10.3125 17.3403 9.87305 17.7505 9.375 17.7505H0.9375C0.410156 17.7505 0 17.3403 0 16.813C0 16.3149 0.410156 15.8755 0.9375 15.8755V4.62549ZM2.8125 5.09424V7.90674C2.8125 8.17041 3.01758 8.37549 3.28125 8.37549H7.03125C7.26562 8.37549 7.5 8.17041 7.5 7.90674V5.09424C7.5 4.85986 7.26562 4.62549 7.03125 4.62549H3.28125C3.01758 4.62549 2.8125 4.85986 2.8125 5.09424Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_gas_light.svg b/client/public/themes/olympus/images/icons_actions_gas_light.svg
new file mode 100644
index 00000000..f9c9ebd0
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_gas_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.9375 4.62549C0.9375 3.6001 1.75781 2.75049 2.8125 2.75049H7.5C8.52539 2.75049 9.375 3.6001 9.375 4.62549V10.2505H9.60938C11.0156 10.2505 12.1875 11.4224 12.1875 12.8286V13.7661C12.1875 14.1763 12.4805 14.4692 12.8906 14.4692C13.2715 14.4692 13.5938 14.1763 13.5938 13.7661V9.25439C12.7734 9.04932 12.1875 8.31689 12.1875 7.43799V5.56299L11.25 4.62549C10.9863 4.39111 10.9863 3.95166 11.25 3.68799C11.4844 3.45361 11.9238 3.45361 12.1875 3.68799L14.4434 5.97314C14.7949 6.32471 15 6.79346 15 7.2915V7.67236V8.37549V9.31299V13.7661C15 14.938 14.0332 15.8755 12.8906 15.8755C11.7188 15.8755 10.7812 14.938 10.7812 13.7661V12.8286C10.7812 12.1841 10.2539 11.6567 9.60938 11.6567H9.375V15.8755C9.87305 15.8755 10.3125 16.3149 10.3125 16.813C10.3125 17.3403 9.87305 17.7505 9.375 17.7505H0.9375C0.410156 17.7505 0 17.3403 0 16.813C0 16.3149 0.410156 15.8755 0.9375 15.8755V4.62549ZM2.8125 5.09424V7.90674C2.8125 8.17041 3.01758 8.37549 3.28125 8.37549H7.03125C7.26562 8.37549 7.5 8.17041 7.5 7.90674V5.09424C7.5 4.85986 7.26562 4.62549 7.03125 4.62549H3.28125C3.01758 4.62549 2.8125 4.85986 2.8125 5.09424Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_nothing_dark.svg b/client/public/themes/olympus/images/icons_actions_nothing_dark.svg
new file mode 100644
index 00000000..f6bb0463
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_nothing_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.582 7.17432C11.9629 6.82275 11.9629 6.20752 11.582 5.85596C11.2305 5.4751 10.6152 5.4751 10.2637 5.85596L7.1875 8.93213L4.08203 5.85596C3.73047 5.4751 3.11523 5.4751 2.76367 5.85596C2.38281 6.20752 2.38281 6.82275 2.76367 7.17432L5.83984 10.2505L2.76367 13.356C2.38281 13.7075 2.38281 14.3228 2.76367 14.6743C3.11523 15.0552 3.73047 15.0552 4.08203 14.6743L7.1875 11.5981L10.2637 14.6743C10.6152 15.0552 11.2305 15.0552 11.582 14.6743C11.9629 14.3228 11.9629 13.7075 11.582 13.356L8.50586 10.2505L11.582 7.17432Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_nothing_light.svg b/client/public/themes/olympus/images/icons_actions_nothing_light.svg
new file mode 100644
index 00000000..1ea95812
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_nothing_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.582 7.17432C11.9629 6.82275 11.9629 6.20752 11.582 5.85596C11.2305 5.4751 10.6152 5.4751 10.2637 5.85596L7.1875 8.93213L4.08203 5.85596C3.73047 5.4751 3.11523 5.4751 2.76367 5.85596C2.38281 6.20752 2.38281 6.82275 2.76367 7.17432L5.83984 10.2505L2.76367 13.356C2.38281 13.7075 2.38281 14.3228 2.76367 14.6743C3.11523 15.0552 3.73047 15.0552 4.08203 14.6743L7.1875 11.5981L10.2637 14.6743C10.6152 15.0552 11.2305 15.0552 11.582 14.6743C11.9629 14.3228 11.9629 13.7075 11.582 13.356L8.50586 10.2505L11.582 7.17432Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_rtb_dark.svg b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
new file mode 100644
index 00000000..c3682f22
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="19" viewBox="0 0 17 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.8457 10.2505C16.8457 10.7778 16.4062 11.188 15.9082 11.188H14.9707L15 15.8755C15 15.9634 15 16.0513 15 16.1099V16.5786C15 17.2524 14.4727 17.7505 13.8281 17.7505H13.3594C13.3008 17.7505 13.2715 17.7505 13.2422 17.7505C13.2129 17.7505 13.1543 17.7505 13.125 17.7505H12.1875H11.4844C10.8105 17.7505 10.3125 17.2524 10.3125 16.5786V15.8755V14.0005C10.3125 13.5024 9.87305 13.063 9.375 13.063H7.5C6.97266 13.063 6.5625 13.5024 6.5625 14.0005V15.8755V16.5786C6.5625 17.2524 6.03516 17.7505 5.39062 17.7505H4.6875H3.75C3.69141 17.7505 3.66211 17.7505 3.60352 17.7505C3.57422 17.7505 3.54492 17.7505 3.51562 17.7505H3.04688C2.37305 17.7505 1.875 17.2524 1.875 16.5786V13.2974C1.875 13.2974 1.875 13.2681 1.875 13.2388V11.188H0.9375C0.410156 11.188 0 10.7778 0 10.2505C0 9.98682 0.0878906 9.75244 0.292969 9.54736L7.79297 2.98486C7.99805 2.77979 8.23242 2.75049 8.4375 2.75049C8.64258 2.75049 8.87695 2.80908 9.05273 2.95557L16.5234 9.54736C16.7578 9.75244 16.875 9.98682 16.8457 10.2505Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_rtb_light.svg b/client/public/themes/olympus/images/icons_actions_rtb_light.svg
new file mode 100644
index 00000000..0c9231e3
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_rtb_light.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="19" viewBox="0 0 17 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.8457 10.2505C16.8457 10.7778 16.4062 11.188 15.9082 11.188H14.9707L15 15.8755C15 15.9634 15 16.0513 15 16.1099V16.5786C15 17.2524 14.4727 17.7505 13.8281 17.7505H13.3594C13.3008 17.7505 13.2715 17.7505 13.2422 17.7505C13.2129 17.7505 13.1543 17.7505 13.125 17.7505H12.1875H11.4844C10.8105 17.7505 10.3125 17.2524 10.3125 16.5786V15.8755V14.0005C10.3125 13.5024 9.87305 13.063 9.375 13.063H7.5C6.97266 13.063 6.5625 13.5024 6.5625 14.0005V15.8755V16.5786C6.5625 17.2524 6.03516 17.7505 5.39062 17.7505H4.6875H3.75C3.69141 17.7505 3.66211 17.7505 3.60352 17.7505C3.57422 17.7505 3.54492 17.7505 3.51562 17.7505H3.04688C2.37305 17.7505 1.875 17.2524 1.875 16.5786V13.2974C1.875 13.2974 1.875 13.2681 1.875 13.2388V11.188H0.9375C0.410156 11.188 0 10.7778 0 10.2505C0 9.98682 0.0878906 9.75244 0.292969 9.54736L7.79297 2.98486C7.99805 2.77979 8.23242 2.75049 8.4375 2.75049C8.64258 2.75049 8.87695 2.80908 9.05273 2.95557L16.5234 9.54736C16.7578 9.75244 16.875 9.98682 16.8457 10.2505Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_search_dark.svg b/client/public/themes/olympus/images/icons_actions_search_dark.svg
new file mode 100644
index 00000000..497481c1
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_search_dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.1875 8.84424C12.1875 10.1919 11.748 11.4517 11.0156 12.4478L14.707 16.1685C15.0879 16.52 15.0879 17.1353 14.707 17.4868C14.3555 17.8677 13.7402 17.8677 13.3887 17.4868L9.66797 13.7661C8.67188 14.5278 7.41211 14.938 6.09375 14.938C2.72461 14.938 0 12.2134 0 8.84424C0 5.50439 2.72461 2.75049 6.09375 2.75049C9.43359 2.75049 12.1875 5.50439 12.1875 8.84424ZM6.09375 13.063C8.4082 13.063 10.3125 11.188 10.3125 8.84424C10.3125 6.52979 8.4082 4.62549 6.09375 4.62549C3.75 4.62549 1.875 6.52979 1.875 8.84424C1.875 11.188 3.75 13.063 6.09375 13.063Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_search_light.svg b/client/public/themes/olympus/images/icons_actions_search_light.svg
new file mode 100644
index 00000000..2ca59cbb
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_search_light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.1875 8.84424C12.1875 10.1919 11.748 11.4517 11.0156 12.4478L14.707 16.1685C15.0879 16.52 15.0879 17.1353 14.707 17.4868C14.3555 17.8677 13.7402 17.8677 13.3887 17.4868L9.66797 13.7661C8.67188 14.5278 7.41211 14.938 6.09375 14.938C2.72461 14.938 0 12.2134 0 8.84424C0 5.50439 2.72461 2.75049 6.09375 2.75049C9.43359 2.75049 12.1875 5.50439 12.1875 8.84424ZM6.09375 13.063C8.4082 13.063 10.3125 11.188 10.3125 8.84424C10.3125 6.52979 8.4082 4.62549 6.09375 4.62549C3.75 4.62549 1.875 6.52979 1.875 8.84424C1.875 11.188 3.75 13.063 6.09375 13.063Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_abreast_dark.svg b/client/public/themes/olympus/images/icons_form_abreast_dark.svg
new file mode 100644
index 00000000..c528c451
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_abreast_dark.svg
@@ -0,0 +1,5 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.7297 12.0271C24.6906 11.9349 24.6 11.8755 24.5 11.8755C24.4 11.8755 24.3094 11.9349 24.2703 12.0271L23.5812 13.6349C23.5281 13.7599 23.5 13.8927 23.5 14.0286V15.2318L21.25 16.5442V16.2505C21.25 16.0427 21.0828 15.8755 20.875 15.8755C20.6672 15.8755 20.5 16.0427 20.5 16.2505V17.1255V17.6255V18.0005C20.5 18.2083 20.6672 18.3755 20.875 18.3755C21.0828 18.3755 21.25 18.2083 21.25 18.0005V17.8755H23.5V18.3864L22.5859 19.188C22.5312 19.2349 22.5 19.3036 22.5 19.3755V19.6255C22.5 19.763 22.6125 19.8755 22.75 19.8755H24.25V18.8755C24.25 18.738 24.3625 18.6255 24.5 18.6255C24.6375 18.6255 24.75 18.738 24.75 18.8755V19.8755H26.25C26.3875 19.8755 26.5 19.763 26.5 19.6255V19.3755C26.5 19.3036 26.4688 19.2349 26.4141 19.188L25.5 18.3864V17.8755H27.75V18.0005C27.75 18.2083 27.9172 18.3755 28.125 18.3755C28.3328 18.3755 28.5 18.2083 28.5 18.0005V17.6255V17.1255V16.2505C28.5 16.0427 28.3328 15.8755 28.125 15.8755C27.9172 15.8755 27.75 16.0427 27.75 16.2505V16.5442L25.5 15.2318V14.0286C25.5 13.8927 25.4719 13.7599 25.4187 13.6349L24.7297 12.0271Z" fill="#202831"/>
+<path d="M7.72969 12.0271C7.69063 11.9349 7.6 11.8755 7.5 11.8755C7.4 11.8755 7.30938 11.9349 7.27031 12.0271L6.58125 13.6349C6.52812 13.7599 6.5 13.8927 6.5 14.0286V15.2318L4.25 16.5442V16.2505C4.25 16.0427 4.08281 15.8755 3.875 15.8755C3.66719 15.8755 3.5 16.0427 3.5 16.2505V17.1255V17.6255V18.0005C3.5 18.2083 3.66719 18.3755 3.875 18.3755C4.08281 18.3755 4.25 18.2083 4.25 18.0005V17.8755H6.5V18.3864L5.58594 19.188C5.53125 19.2349 5.5 19.3036 5.5 19.3755V19.6255C5.5 19.763 5.6125 19.8755 5.75 19.8755H7.25V18.8755C7.25 18.738 7.3625 18.6255 7.5 18.6255C7.6375 18.6255 7.75 18.738 7.75 18.8755V19.8755H9.25C9.3875 19.8755 9.5 19.763 9.5 19.6255V19.3755C9.5 19.3036 9.46875 19.2349 9.41406 19.188L8.5 18.3864V17.8755H10.75V18.0005C10.75 18.2083 10.9172 18.3755 11.125 18.3755C11.3328 18.3755 11.5 18.2083 11.5 18.0005V17.6255V17.1255V16.2505C11.5 16.0427 11.3328 15.8755 11.125 15.8755C10.9172 15.8755 10.75 16.0427 10.75 16.2505V16.5442L8.5 15.2318V14.0286C8.5 13.8927 8.47187 13.7599 8.41875 13.6349L7.72969 12.0271Z" fill="#202831"/>
+<path d="M14 17.3755H18" stroke="#202831" stroke-linecap="round" stroke-dasharray="2 2"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_abreast_light.svg b/client/public/themes/olympus/images/icons_form_abreast_light.svg
new file mode 100644
index 00000000..2408169f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_abreast_light.svg
@@ -0,0 +1,5 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.7297 12.0271C24.6906 11.9349 24.6 11.8755 24.5 11.8755C24.4 11.8755 24.3094 11.9349 24.2703 12.0271L23.5812 13.6349C23.5281 13.7599 23.5 13.8927 23.5 14.0286V15.2318L21.25 16.5442V16.2505C21.25 16.0427 21.0828 15.8755 20.875 15.8755C20.6672 15.8755 20.5 16.0427 20.5 16.2505V17.1255V17.6255V18.0005C20.5 18.2083 20.6672 18.3755 20.875 18.3755C21.0828 18.3755 21.25 18.2083 21.25 18.0005V17.8755H23.5V18.3864L22.5859 19.188C22.5312 19.2349 22.5 19.3036 22.5 19.3755V19.6255C22.5 19.763 22.6125 19.8755 22.75 19.8755H24.25V18.8755C24.25 18.738 24.3625 18.6255 24.5 18.6255C24.6375 18.6255 24.75 18.738 24.75 18.8755V19.8755H26.25C26.3875 19.8755 26.5 19.763 26.5 19.6255V19.3755C26.5 19.3036 26.4688 19.2349 26.4141 19.188L25.5 18.3864V17.8755H27.75V18.0005C27.75 18.2083 27.9172 18.3755 28.125 18.3755C28.3328 18.3755 28.5 18.2083 28.5 18.0005V17.6255V17.1255V16.2505C28.5 16.0427 28.3328 15.8755 28.125 15.8755C27.9172 15.8755 27.75 16.0427 27.75 16.2505V16.5442L25.5 15.2318V14.0286C25.5 13.8927 25.4719 13.7599 25.4187 13.6349L24.7297 12.0271Z" fill="#5CA7FF"/>
+<path d="M7.72969 12.0271C7.69063 11.9349 7.6 11.8755 7.5 11.8755C7.4 11.8755 7.30938 11.9349 7.27031 12.0271L6.58125 13.6349C6.52812 13.7599 6.5 13.8927 6.5 14.0286V15.2318L4.25 16.5442V16.2505C4.25 16.0427 4.08281 15.8755 3.875 15.8755C3.66719 15.8755 3.5 16.0427 3.5 16.2505V17.1255V17.6255V18.0005C3.5 18.2083 3.66719 18.3755 3.875 18.3755C4.08281 18.3755 4.25 18.2083 4.25 18.0005V17.8755H6.5V18.3864L5.58594 19.188C5.53125 19.2349 5.5 19.3036 5.5 19.3755V19.6255C5.5 19.763 5.6125 19.8755 5.75 19.8755H7.25V18.8755C7.25 18.738 7.3625 18.6255 7.5 18.6255C7.6375 18.6255 7.75 18.738 7.75 18.8755V19.8755H9.25C9.3875 19.8755 9.5 19.763 9.5 19.6255V19.3755C9.5 19.3036 9.46875 19.2349 9.41406 19.188L8.5 18.3864V17.8755H10.75V18.0005C10.75 18.2083 10.9172 18.3755 11.125 18.3755C11.3328 18.3755 11.5 18.2083 11.5 18.0005V17.6255V17.1255V16.2505C11.5 16.0427 11.3328 15.8755 11.125 15.8755C10.9172 15.8755 10.75 16.0427 10.75 16.2505V16.5442L8.5 15.2318V14.0286C8.5 13.8927 8.47187 13.7599 8.41875 13.6349L7.72969 12.0271Z" fill="#5CA7FF"/>
+<path d="M14 17.3755H18" stroke="#5CA7FF" stroke-linecap="round" stroke-dasharray="2 2"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_admin_dark.svg b/client/public/themes/olympus/images/icons_form_admin_dark.svg
new file mode 100644
index 00000000..49d375dd
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_admin_dark.svg
@@ -0,0 +1,4 @@
+<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.20834 4.78954C9.1445 4.63898 8.99647 4.54199 8.83314 4.54199C8.6698 4.54199 8.52179 4.63898 8.45798 4.78954L7.33252 7.41564C7.24574 7.61981 7.1998 7.83673 7.1998 8.05876V10.0238L3.5248 12.1676V11.6878C3.5248 11.3484 3.25173 11.0753 2.9123 11.0753C2.57288 11.0753 2.2998 11.3484 2.2998 11.6878V13.117V13.9337V14.5462C2.2998 14.8856 2.57288 15.1587 2.9123 15.1587C3.25173 15.1587 3.5248 14.8856 3.5248 14.5462V14.342H7.1998V15.1765L5.70684 16.4858C5.61752 16.5623 5.56647 16.6746 5.56647 16.792V17.2003C5.56647 17.4249 5.75022 17.6087 5.9748 17.6087H8.4248V15.9753C8.4248 15.7508 8.60855 15.567 8.83314 15.567C9.0577 15.567 9.24147 15.7508 9.24147 15.9753V17.6087H11.6915C11.916 17.6087 12.0998 17.4249 12.0998 17.2003V16.792C12.0998 16.6746 12.0488 16.5623 11.9594 16.4858L10.4665 15.1765V14.342H14.1415V14.5462C14.1415 14.8856 14.4146 15.1587 14.754 15.1587C15.0934 15.1587 15.3665 14.8856 15.3665 14.5462V13.9337V13.117V11.6878C15.3665 11.3484 15.0934 11.0753 14.754 11.0753C14.4146 11.0753 14.1415 11.3484 14.1415 11.6878V12.1676L10.4665 10.0238V8.05876C10.4665 7.83673 10.4206 7.61981 10.3338 7.41564L9.20834 4.78954Z" fill="#202831"/>
+<path d="M19.8732 13.2084C19.8097 13.0816 19.6625 13 19.5 13C19.3375 13 19.1903 13.0816 19.1268 13.2084L18.0071 15.4191C17.9207 15.591 17.875 15.7736 17.875 15.9605V17.6148L14.2188 19.4195V19.0156C14.2188 18.7299 13.9471 18.5 13.6094 18.5C13.2717 18.5 13 18.7299 13 19.0156V20.2188V20.9062V21.4219C13 21.7076 13.2717 21.9375 13.6094 21.9375C13.9471 21.9375 14.2188 21.7076 14.2188 21.4219V21.25H17.875V21.9525L16.3896 23.0547C16.3008 23.1191 16.25 23.2137 16.25 23.3125V23.6562C16.25 23.8453 16.4328 24 16.6563 24H19.0938V22.625C19.0938 22.4359 19.2765 22.2812 19.5 22.2812C19.7235 22.2812 19.9063 22.4359 19.9063 22.625V24H22.3438C22.5672 24 22.75 23.8453 22.75 23.6562V23.3125C22.75 23.2137 22.6992 23.1191 22.6104 23.0547L21.125 21.9525V21.25H24.7812V21.4219C24.7812 21.7076 25.053 21.9375 25.3906 21.9375C25.7283 21.9375 26 21.7076 26 21.4219V20.9062V20.2188V19.0156C26 18.7299 25.7283 18.5 25.3906 18.5C25.053 18.5 24.7812 18.7299 24.7812 19.0156V19.4195L21.125 17.6148V15.9605C21.125 15.7736 21.0793 15.591 20.9929 15.4191L19.8732 13.2084Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_admin_light.svg b/client/public/themes/olympus/images/icons_form_admin_light.svg
new file mode 100644
index 00000000..dbf4f074
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_admin_light.svg
@@ -0,0 +1,4 @@
+<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.20834 4.78954C9.1445 4.63898 8.99647 4.54199 8.83314 4.54199C8.6698 4.54199 8.52179 4.63898 8.45798 4.78954L7.33252 7.41564C7.24574 7.61981 7.1998 7.83673 7.1998 8.05876V10.0238L3.5248 12.1676V11.6878C3.5248 11.3484 3.25173 11.0753 2.9123 11.0753C2.57288 11.0753 2.2998 11.3484 2.2998 11.6878V13.117V13.9337V14.5462C2.2998 14.8856 2.57288 15.1587 2.9123 15.1587C3.25173 15.1587 3.5248 14.8856 3.5248 14.5462V14.342H7.1998V15.1765L5.70684 16.4858C5.61752 16.5623 5.56647 16.6746 5.56647 16.792V17.2003C5.56647 17.4249 5.75022 17.6087 5.9748 17.6087H8.4248V15.9753C8.4248 15.7508 8.60855 15.567 8.83314 15.567C9.0577 15.567 9.24147 15.7508 9.24147 15.9753V17.6087H11.6915C11.916 17.6087 12.0998 17.4249 12.0998 17.2003V16.792C12.0998 16.6746 12.0488 16.5623 11.9594 16.4858L10.4665 15.1765V14.342H14.1415V14.5462C14.1415 14.8856 14.4146 15.1587 14.754 15.1587C15.0934 15.1587 15.3665 14.8856 15.3665 14.5462V13.9337V13.117V11.6878C15.3665 11.3484 15.0934 11.0753 14.754 11.0753C14.4146 11.0753 14.1415 11.3484 14.1415 11.6878V12.1676L10.4665 10.0238V8.05876C10.4665 7.83673 10.4206 7.61981 10.3338 7.41564L9.20834 4.78954Z" fill="#5CA7FF"/>
+<path d="M19.8732 13.2084C19.8097 13.0816 19.6625 13 19.5 13C19.3375 13 19.1903 13.0816 19.1268 13.2084L18.0071 15.4191C17.9207 15.591 17.875 15.7736 17.875 15.9605V17.6148L14.2188 19.4195V19.0156C14.2188 18.7299 13.9471 18.5 13.6094 18.5C13.2717 18.5 13 18.7299 13 19.0156V20.2188V20.9062V21.4219C13 21.7076 13.2717 21.9375 13.6094 21.9375C13.9471 21.9375 14.2188 21.7076 14.2188 21.4219V21.25H17.875V21.9525L16.3896 23.0547C16.3008 23.1191 16.25 23.2137 16.25 23.3125V23.6562C16.25 23.8453 16.4328 24 16.6563 24H19.0938V22.625C19.0938 22.4359 19.2765 22.2812 19.5 22.2812C19.7235 22.2812 19.9063 22.4359 19.9063 22.625V24H22.3438C22.5672 24 22.75 23.8453 22.75 23.6562V23.3125C22.75 23.2137 22.6992 23.1191 22.6104 23.0547L21.125 21.9525V21.25H24.7813V21.4219C24.7813 21.7076 25.053 21.9375 25.3906 21.9375C25.7283 21.9375 26 21.7076 26 21.4219V20.9062V20.2188V19.0156C26 18.7299 25.7283 18.5 25.3906 18.5C25.053 18.5 24.7813 18.7299 24.7813 19.0156V19.4195L21.125 17.6148V15.9605C21.125 15.7736 21.0793 15.591 20.9929 15.4191L19.8732 13.2084Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_echelon_dark.svg b/client/public/themes/olympus/images/icons_form_echelon_dark.svg
new file mode 100644
index 00000000..25144e4f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_echelon_dark.svg
@@ -0,0 +1,4 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.7297 17.0271C21.6906 16.9349 21.6 16.8755 21.5 16.8755C21.4 16.8755 21.3094 16.9349 21.2703 17.0271L20.5812 18.6349C20.5281 18.7599 20.5 18.8927 20.5 19.0286V20.2318L18.25 21.5442V21.2505C18.25 21.0427 18.0828 20.8755 17.875 20.8755C17.6672 20.8755 17.5 21.0427 17.5 21.2505V22.1255V22.6255V23.0005C17.5 23.2083 17.6672 23.3755 17.875 23.3755C18.0828 23.3755 18.25 23.2083 18.25 23.0005V22.8755H20.5V23.3864L19.5859 24.188C19.5312 24.2349 19.5 24.3036 19.5 24.3755V24.6255C19.5 24.763 19.6125 24.8755 19.75 24.8755H21.25V23.8755C21.25 23.738 21.3625 23.6255 21.5 23.6255C21.6375 23.6255 21.75 23.738 21.75 23.8755V24.8755H23.25C23.3875 24.8755 23.5 24.763 23.5 24.6255V24.3755C23.5 24.3036 23.4688 24.2349 23.4141 24.188L22.5 23.3864V22.8755H24.75V23.0005C24.75 23.2083 24.9172 23.3755 25.125 23.3755C25.3328 23.3755 25.5 23.2083 25.5 23.0005V22.6255V22.1255V21.2505C25.5 21.0427 25.3328 20.8755 25.125 20.8755C24.9172 20.8755 24.75 21.0427 24.75 21.2505V21.5442L22.5 20.2318V19.0286C22.5 18.8927 22.4719 18.7599 22.4187 18.6349L21.7297 17.0271Z" fill="#202831"/>
+<path d="M9.72969 7.02705C9.69063 6.93486 9.6 6.87549 9.5 6.87549C9.4 6.87549 9.30938 6.93486 9.27031 7.02705L8.58125 8.63486C8.52812 8.75986 8.5 8.89268 8.5 9.02862V10.2317L6.25 11.5442V11.2505C6.25 11.0427 6.08281 10.8755 5.875 10.8755C5.66719 10.8755 5.5 11.0427 5.5 11.2505V12.1255V12.6255V13.0005C5.5 13.2083 5.66719 13.3755 5.875 13.3755C6.08281 13.3755 6.25 13.2083 6.25 13.0005V12.8755H8.5V13.3864L7.58594 14.188C7.53125 14.2349 7.5 14.3036 7.5 14.3755V14.6255C7.5 14.763 7.6125 14.8755 7.75 14.8755H9.25V13.8755C9.25 13.738 9.3625 13.6255 9.5 13.6255C9.6375 13.6255 9.75 13.738 9.75 13.8755V14.8755H11.25C11.3875 14.8755 11.5 14.763 11.5 14.6255V14.3755C11.5 14.3036 11.4688 14.2349 11.4141 14.188L10.5 13.3864V12.8755H12.75V13.0005C12.75 13.2083 12.9172 13.3755 13.125 13.3755C13.3328 13.3755 13.5 13.2083 13.5 13.0005V12.6255V12.1255V11.2505C13.5 11.0427 13.3328 10.8755 13.125 10.8755C12.9172 10.8755 12.75 11.0427 12.75 11.2505V11.5442L10.5 10.2317V9.02862C10.5 8.89268 10.4719 8.75986 10.4187 8.63486L9.72969 7.02705Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_echelon_light.svg b/client/public/themes/olympus/images/icons_form_echelon_light.svg
new file mode 100644
index 00000000..42215873
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_echelon_light.svg
@@ -0,0 +1,4 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.7297 17.0271C21.6906 16.9349 21.6 16.8755 21.5 16.8755C21.4 16.8755 21.3094 16.9349 21.2703 17.0271L20.5812 18.6349C20.5281 18.7599 20.5 18.8927 20.5 19.0286V20.2318L18.25 21.5442V21.2505C18.25 21.0427 18.0828 20.8755 17.875 20.8755C17.6672 20.8755 17.5 21.0427 17.5 21.2505V22.1255V22.6255V23.0005C17.5 23.2083 17.6672 23.3755 17.875 23.3755C18.0828 23.3755 18.25 23.2083 18.25 23.0005V22.8755H20.5V23.3864L19.5859 24.188C19.5312 24.2349 19.5 24.3036 19.5 24.3755V24.6255C19.5 24.763 19.6125 24.8755 19.75 24.8755H21.25V23.8755C21.25 23.738 21.3625 23.6255 21.5 23.6255C21.6375 23.6255 21.75 23.738 21.75 23.8755V24.8755H23.25C23.3875 24.8755 23.5 24.763 23.5 24.6255V24.3755C23.5 24.3036 23.4688 24.2349 23.4141 24.188L22.5 23.3864V22.8755H24.75V23.0005C24.75 23.2083 24.9172 23.3755 25.125 23.3755C25.3328 23.3755 25.5 23.2083 25.5 23.0005V22.6255V22.1255V21.2505C25.5 21.0427 25.3328 20.8755 25.125 20.8755C24.9172 20.8755 24.75 21.0427 24.75 21.2505V21.5442L22.5 20.2318V19.0286C22.5 18.8927 22.4719 18.7599 22.4187 18.6349L21.7297 17.0271Z" fill="#5CA7FF"/>
+<path d="M9.72969 7.02705C9.69063 6.93486 9.6 6.87549 9.5 6.87549C9.4 6.87549 9.30938 6.93486 9.27031 7.02705L8.58125 8.63486C8.52812 8.75986 8.5 8.89268 8.5 9.02862V10.2317L6.25 11.5442V11.2505C6.25 11.0427 6.08281 10.8755 5.875 10.8755C5.66719 10.8755 5.5 11.0427 5.5 11.2505V12.1255V12.6255V13.0005C5.5 13.2083 5.66719 13.3755 5.875 13.3755C6.08281 13.3755 6.25 13.2083 6.25 13.0005V12.8755H8.5V13.3864L7.58594 14.188C7.53125 14.2349 7.5 14.3036 7.5 14.3755V14.6255C7.5 14.763 7.6125 14.8755 7.75 14.8755H9.25V13.8755C9.25 13.738 9.3625 13.6255 9.5 13.6255C9.6375 13.6255 9.75 13.738 9.75 13.8755V14.8755H11.25C11.3875 14.8755 11.5 14.763 11.5 14.6255V14.3755C11.5 14.3036 11.4688 14.2349 11.4141 14.188L10.5 13.3864V12.8755H12.75V13.0005C12.75 13.2083 12.9172 13.3755 13.125 13.3755C13.3328 13.3755 13.5 13.2083 13.5 13.0005V12.6255V12.1255V11.2505C13.5 11.0427 13.3328 10.8755 13.125 10.8755C12.9172 10.8755 12.75 11.0427 12.75 11.2505V11.5442L10.5 10.2317V9.02862C10.5 8.89268 10.4719 8.75986 10.4187 8.63486L9.72969 7.02705Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_trail_dark.svg b/client/public/themes/olympus/images/icons_form_trail_dark.svg
new file mode 100644
index 00000000..0c9ff544
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_trail_dark.svg
@@ -0,0 +1,4 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.7297 18.0271C15.6906 17.9349 15.6 17.8755 15.5 17.8755C15.4 17.8755 15.3094 17.9349 15.2703 18.0271L14.5812 19.6349C14.5281 19.7599 14.5 19.8927 14.5 20.0286V21.2318L12.25 22.5442V22.2505C12.25 22.0427 12.0828 21.8755 11.875 21.8755C11.6672 21.8755 11.5 22.0427 11.5 22.2505V23.1255V23.6255V24.0005C11.5 24.2083 11.6672 24.3755 11.875 24.3755C12.0828 24.3755 12.25 24.2083 12.25 24.0005V23.8755H14.5V24.3864L13.5859 25.188C13.5312 25.2349 13.5 25.3036 13.5 25.3755V25.6255C13.5 25.763 13.6125 25.8755 13.75 25.8755H15.25V24.8755C15.25 24.738 15.3625 24.6255 15.5 24.6255C15.6375 24.6255 15.75 24.738 15.75 24.8755V25.8755H17.25C17.3875 25.8755 17.5 25.763 17.5 25.6255V25.3755C17.5 25.3036 17.4688 25.2349 17.4141 25.188L16.5 24.3864V23.8755H18.75V24.0005C18.75 24.2083 18.9172 24.3755 19.125 24.3755C19.3328 24.3755 19.5 24.2083 19.5 24.0005V23.6255V23.1255V22.2505C19.5 22.0427 19.3328 21.8755 19.125 21.8755C18.9172 21.8755 18.75 22.0427 18.75 22.2505V22.5442L16.5 21.2318V20.0286C16.5 19.8927 16.4719 19.7599 16.4187 19.6349L15.7297 18.0271Z" fill="#202831"/>
+<path d="M15.7297 4.02705C15.6906 3.93486 15.6 3.87549 15.5 3.87549C15.4 3.87549 15.3094 3.93486 15.2703 4.02705L14.5812 5.63486C14.5281 5.75986 14.5 5.89268 14.5 6.02862V7.23174L12.25 8.54424V8.25049C12.25 8.04268 12.0828 7.87549 11.875 7.87549C11.6672 7.87549 11.5 8.04268 11.5 8.25049V9.12549V9.62549V10.0005C11.5 10.2083 11.6672 10.3755 11.875 10.3755C12.0828 10.3755 12.25 10.2083 12.25 10.0005V9.87549H14.5V10.3864L13.5859 11.188C13.5312 11.2349 13.5 11.3036 13.5 11.3755V11.6255C13.5 11.763 13.6125 11.8755 13.75 11.8755H15.25V10.8755C15.25 10.738 15.3625 10.6255 15.5 10.6255C15.6375 10.6255 15.75 10.738 15.75 10.8755V11.8755H17.25C17.3875 11.8755 17.5 11.763 17.5 11.6255V11.3755C17.5 11.3036 17.4688 11.2349 17.4141 11.188L16.5 10.3864V9.87549H18.75V10.0005C18.75 10.2083 18.9172 10.3755 19.125 10.3755C19.3328 10.3755 19.5 10.2083 19.5 10.0005V9.62549V9.12549V8.25049C19.5 8.04268 19.3328 7.87549 19.125 7.87549C18.9172 7.87549 18.75 8.04268 18.75 8.25049V8.54424L16.5 7.23174V6.02862C16.5 5.89268 16.4719 5.75986 16.4187 5.63486L15.7297 4.02705Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_form_trail_light.svg b/client/public/themes/olympus/images/icons_form_trail_light.svg
new file mode 100644
index 00000000..bf9fcfd3
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_form_trail_light.svg
@@ -0,0 +1,4 @@
+<svg width="31" height="31" viewBox="0 0 31 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.7297 18.0271C15.6906 17.9349 15.6 17.8755 15.5 17.8755C15.4 17.8755 15.3094 17.9349 15.2703 18.0271L14.5812 19.6349C14.5281 19.7599 14.5 19.8927 14.5 20.0286V21.2318L12.25 22.5442V22.2505C12.25 22.0427 12.0828 21.8755 11.875 21.8755C11.6672 21.8755 11.5 22.0427 11.5 22.2505V23.1255V23.6255V24.0005C11.5 24.2083 11.6672 24.3755 11.875 24.3755C12.0828 24.3755 12.25 24.2083 12.25 24.0005V23.8755H14.5V24.3864L13.5859 25.188C13.5312 25.2349 13.5 25.3036 13.5 25.3755V25.6255C13.5 25.763 13.6125 25.8755 13.75 25.8755H15.25V24.8755C15.25 24.738 15.3625 24.6255 15.5 24.6255C15.6375 24.6255 15.75 24.738 15.75 24.8755V25.8755H17.25C17.3875 25.8755 17.5 25.763 17.5 25.6255V25.3755C17.5 25.3036 17.4688 25.2349 17.4141 25.188L16.5 24.3864V23.8755H18.75V24.0005C18.75 24.2083 18.9172 24.3755 19.125 24.3755C19.3328 24.3755 19.5 24.2083 19.5 24.0005V23.6255V23.1255V22.2505C19.5 22.0427 19.3328 21.8755 19.125 21.8755C18.9172 21.8755 18.75 22.0427 18.75 22.2505V22.5442L16.5 21.2318V20.0286C16.5 19.8927 16.4719 19.7599 16.4187 19.6349L15.7297 18.0271Z" fill="#5CA7FF"/>
+<path d="M15.7297 4.02705C15.6906 3.93486 15.6 3.87549 15.5 3.87549C15.4 3.87549 15.3094 3.93486 15.2703 4.02705L14.5812 5.63486C14.5281 5.75986 14.5 5.89268 14.5 6.02862V7.23174L12.25 8.54424V8.25049C12.25 8.04268 12.0828 7.87549 11.875 7.87549C11.6672 7.87549 11.5 8.04268 11.5 8.25049V9.12549V9.62549V10.0005C11.5 10.2083 11.6672 10.3755 11.875 10.3755C12.0828 10.3755 12.25 10.2083 12.25 10.0005V9.87549H14.5V10.3864L13.5859 11.188C13.5312 11.2349 13.5 11.3036 13.5 11.3755V11.6255C13.5 11.763 13.6125 11.8755 13.75 11.8755H15.25V10.8755C15.25 10.738 15.3625 10.6255 15.5 10.6255C15.6375 10.6255 15.75 10.738 15.75 10.8755V11.8755H17.25C17.3875 11.8755 17.5 11.763 17.5 11.6255V11.3755C17.5 11.3036 17.4688 11.2349 17.4141 11.188L16.5 10.3864V9.87549H18.75V10.0005C18.75 10.2083 18.9172 10.3755 19.125 10.3755C19.3328 10.3755 19.5 10.2083 19.5 10.0005V9.62549V9.12549V8.25049C19.5 8.04268 19.3328 7.87549 19.125 7.87549C18.9172 7.87549 18.75 8.04268 18.75 8.25049V8.54424L16.5 7.23174V6.02862C16.5 5.89268 16.4719 5.75986 16.4187 5.63486L15.7297 4.02705Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_free_dark.svg b/client/public/themes/olympus/images/icons_roe_free_dark.svg
new file mode 100644
index 00000000..a3b0b02f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_free_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7188 6.50049C11.7188 7.81885 10.957 8.96143 9.84375 9.63525V10.2505C9.84375 10.7778 9.4043 11.188 8.90625 11.188H6.09375C5.56641 11.188 5.15625 10.7778 5.15625 10.2505V9.63525C4.01367 8.96143 3.28125 7.81885 3.28125 6.50049C3.28125 4.44971 5.15625 2.75049 7.5 2.75049C9.81445 2.75049 11.7188 4.44971 11.7188 6.50049ZM5.85938 7.90674C6.35742 7.90674 6.79688 7.49658 6.79688 6.96924C6.79688 6.47119 6.35742 6.03174 5.85938 6.03174C5.33203 6.03174 4.92188 6.47119 4.92188 6.96924C4.92188 7.49658 5.33203 7.90674 5.85938 7.90674ZM10.0781 6.96924C10.0781 6.47119 9.63867 6.03174 9.14062 6.03174C8.61328 6.03174 8.20312 6.47119 8.20312 6.96924C8.20312 7.49658 8.61328 7.90674 9.14062 7.90674C9.63867 7.90674 10.0781 7.49658 10.0781 6.96924ZM1.02539 10.7778C1.25977 10.3091 1.81641 10.1333 2.28516 10.3677L7.5 12.9751L12.6855 10.3677C13.1543 10.1333 13.7109 10.3091 13.9453 10.7778C14.1797 11.2466 14.0039 11.8032 13.5352 12.0376L9.58008 14.0005L13.5352 15.9927C14.0039 16.2271 14.1797 16.7837 13.9453 17.2524C13.7109 17.7212 13.1543 17.897 12.6855 17.6626L7.5 15.0552L2.28516 17.6626C1.81641 17.897 1.25977 17.7212 1.02539 17.2524C0.791016 16.7837 0.966797 16.2271 1.43555 15.9927L5.39062 14.0005L1.43555 12.0376C0.966797 11.8032 0.791016 11.2466 1.02539 10.7778Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_free_light.svg b/client/public/themes/olympus/images/icons_roe_free_light.svg
new file mode 100644
index 00000000..1fdf5d13
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_free_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7188 6.50049C11.7188 7.81885 10.957 8.96143 9.84375 9.63525V10.2505C9.84375 10.7778 9.4043 11.188 8.90625 11.188H6.09375C5.56641 11.188 5.15625 10.7778 5.15625 10.2505V9.63525C4.01367 8.96143 3.28125 7.81885 3.28125 6.50049C3.28125 4.44971 5.15625 2.75049 7.5 2.75049C9.81445 2.75049 11.7188 4.44971 11.7188 6.50049ZM5.85938 7.90674C6.35742 7.90674 6.79688 7.49658 6.79688 6.96924C6.79688 6.47119 6.35742 6.03174 5.85938 6.03174C5.33203 6.03174 4.92188 6.47119 4.92188 6.96924C4.92188 7.49658 5.33203 7.90674 5.85938 7.90674ZM10.0781 6.96924C10.0781 6.47119 9.63867 6.03174 9.14062 6.03174C8.61328 6.03174 8.20312 6.47119 8.20312 6.96924C8.20312 7.49658 8.61328 7.90674 9.14062 7.90674C9.63867 7.90674 10.0781 7.49658 10.0781 6.96924ZM1.02539 10.7778C1.25977 10.3091 1.81641 10.1333 2.28516 10.3677L7.5 12.9751L12.6855 10.3677C13.1543 10.1333 13.7109 10.3091 13.9453 10.7778C14.1797 11.2466 14.0039 11.8032 13.5352 12.0376L9.58008 14.0005L13.5352 15.9927C14.0039 16.2271 14.1797 16.7837 13.9453 17.2524C13.7109 17.7212 13.1543 17.897 12.6855 17.6626L7.5 15.0552L2.28516 17.6626C1.81641 17.897 1.25977 17.7212 1.02539 17.2524C0.791016 16.7837 0.966797 16.2271 1.43555 15.9927L5.39062 14.0005L1.43555 12.0376C0.966797 11.8032 0.791016 11.2466 1.02539 10.7778Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_return_dark.svg b/client/public/themes/olympus/images/icons_roe_return_dark.svg
new file mode 100644
index 00000000..e42485a7
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_return_dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.9375 5.56299H11.3125V3.68799C11.3125 3.33643 11.5176 2.98486 11.8691 2.83838C12.2207 2.69189 12.6309 2.77979 12.8945 3.04346L15.707 5.85596C15.8828 6.03174 16 6.26611 16 6.50049C16 6.76416 15.8828 6.99854 15.707 7.17432L12.8945 9.98682C12.6309 10.2505 12.2207 10.3384 11.8691 10.1919C11.5176 10.0454 11.3125 9.69385 11.3125 9.31299V7.43799H1.9375C1.41016 7.43799 1 7.02783 1 6.50049C1 6.00244 1.41016 5.56299 1.9375 5.56299ZM15.0625 13.063C15.5605 13.063 16 13.5024 16 14.0005C16 14.5278 15.5605 14.938 15.0625 14.938H5.6875V16.813C5.6875 17.1938 5.45312 17.5454 5.10156 17.6919C4.75 17.8384 4.33984 17.7505 4.07617 17.4868L1.26367 14.6743C1.08789 14.4985 0.970703 14.2642 0.970703 14.0298C0.970703 13.7661 1.08789 13.5317 1.26367 13.356L4.07617 10.5435C4.33984 10.2798 4.75 10.1919 5.10156 10.3384C5.45312 10.4849 5.6875 10.8364 5.6875 11.2173V13.0923H15.0625V13.063Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_return_light.svg b/client/public/themes/olympus/images/icons_roe_return_light.svg
new file mode 100644
index 00000000..030534d7
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_return_light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.9375 5.56299H11.3125V3.68799C11.3125 3.33643 11.5176 2.98486 11.8691 2.83838C12.2207 2.69189 12.6309 2.77979 12.8945 3.04346L15.707 5.85596C15.8828 6.03174 16 6.26611 16 6.50049C16 6.76416 15.8828 6.99854 15.707 7.17432L12.8945 9.98682C12.6309 10.2505 12.2207 10.3384 11.8691 10.1919C11.5176 10.0454 11.3125 9.69385 11.3125 9.31299V7.43799H1.9375C1.41016 7.43799 1 7.02783 1 6.50049C1 6.00244 1.41016 5.56299 1.9375 5.56299ZM15.0625 13.063C15.5605 13.063 16 13.5024 16 14.0005C16 14.5278 15.5605 14.938 15.0625 14.938H5.6875V16.813C5.6875 17.1938 5.45312 17.5454 5.10156 17.6919C4.75 17.8384 4.33984 17.7505 4.07617 17.4868L1.26367 14.6743C1.08789 14.4985 0.970703 14.2642 0.970703 14.0298C0.970703 13.7661 1.08789 13.5317 1.26367 13.356L4.07617 10.5435C4.33984 10.2798 4.75 10.1919 5.10156 10.3384C5.45312 10.4849 5.6875 10.8364 5.6875 11.2173V13.0923H15.0625V13.063Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_stop_dark.svg b/client/public/themes/olympus/images/icons_roe_stop_dark.svg
new file mode 100644
index 00000000..fcc0c75f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_stop_dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.4375 3.68799C9.4375 3.18994 8.99805 2.75049 8.5 2.75049C7.97266 2.75049 7.5625 3.18994 7.5625 3.68799V9.78174C7.5625 10.0454 7.32812 10.2505 7.09375 10.2505C6.83008 10.2505 6.625 10.0454 6.625 9.78174V4.62549C6.625 4.12744 6.18555 3.68799 5.6875 3.68799C5.16016 3.68799 4.75 4.12744 4.75 4.62549V12.5942C4.75 12.6528 4.75 12.7114 4.75 12.7407L2.96289 11.0415C2.49414 10.6021 1.76172 10.6313 1.32227 11.1001C0.853516 11.5688 0.882812 12.3013 1.35156 12.7407L4.63281 15.8755C5.89258 17.106 7.5918 17.7505 9.32031 17.7505H9.90625C12.748 17.7505 15.0625 15.4653 15.0625 12.5942V6.50049C15.0625 6.00244 14.623 5.56299 14.125 5.56299C13.5977 5.56299 13.1875 6.00244 13.1875 6.50049V9.78174C13.1875 10.0454 12.9531 10.2505 12.7188 10.2505C12.4551 10.2505 12.25 10.0454 12.25 9.78174V4.62549C12.25 4.12744 11.8105 3.68799 11.3125 3.68799C10.7852 3.68799 10.375 4.12744 10.375 4.62549V9.78174C10.375 10.0454 10.1406 10.2505 9.90625 10.2505C9.64258 10.2505 9.4375 10.0454 9.4375 9.78174V3.68799Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_stop_light.svg b/client/public/themes/olympus/images/icons_roe_stop_light.svg
new file mode 100644
index 00000000..98b50cb4
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_stop_light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="19" viewBox="0 0 16 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.4375 3.68799C9.4375 3.18994 8.99805 2.75049 8.5 2.75049C7.97266 2.75049 7.5625 3.18994 7.5625 3.68799V9.78174C7.5625 10.0454 7.32812 10.2505 7.09375 10.2505C6.83008 10.2505 6.625 10.0454 6.625 9.78174V4.62549C6.625 4.12744 6.18555 3.68799 5.6875 3.68799C5.16016 3.68799 4.75 4.12744 4.75 4.62549V12.5942C4.75 12.6528 4.75 12.7114 4.75 12.7407L2.96289 11.0415C2.49414 10.6021 1.76172 10.6313 1.32227 11.1001C0.853516 11.5688 0.882812 12.3013 1.35156 12.7407L4.63281 15.8755C5.89258 17.106 7.5918 17.7505 9.32031 17.7505H9.90625C12.748 17.7505 15.0625 15.4653 15.0625 12.5942V6.50049C15.0625 6.00244 14.623 5.56299 14.125 5.56299C13.5977 5.56299 13.1875 6.00244 13.1875 6.50049V9.78174C13.1875 10.0454 12.9531 10.2505 12.7188 10.2505C12.4551 10.2505 12.25 10.0454 12.25 9.78174V4.62549C12.25 4.12744 11.8105 3.68799 11.3125 3.68799C10.7852 3.68799 10.375 4.12744 10.375 4.62549V9.78174C10.375 10.0454 10.1406 10.2505 9.90625 10.2505C9.64258 10.2505 9.4375 10.0454 9.4375 9.78174V3.68799Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_target_dark.svg b/client/public/themes/olympus/images/icons_roe_target_dark.svg
new file mode 100644
index 00000000..3a2f17db
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_target_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 2.75049C7.99805 2.75049 8.4375 3.18994 8.4375 3.68799V4.01025C11.1621 4.42041 13.3301 6.58838 13.7402 9.31299H14.0625C14.5605 9.31299 15 9.75244 15 10.2505C15 10.7778 14.5605 11.188 14.0625 11.188H13.7402C13.3301 13.9419 11.1621 16.1099 8.4375 16.52V16.813C8.4375 17.3403 7.99805 17.7505 7.5 17.7505C6.97266 17.7505 6.5625 17.3403 6.5625 16.813V16.52C3.80859 16.1099 1.64062 13.9419 1.23047 11.188H0.9375C0.410156 11.188 0 10.7778 0 10.2505C0 9.75244 0.410156 9.31299 0.9375 9.31299H1.23047C1.64062 6.58838 3.80859 4.42041 6.5625 4.01025V3.68799C6.5625 3.18994 6.97266 2.75049 7.5 2.75049ZM3.13477 11.188C3.48633 12.9165 4.83398 14.2642 6.5625 14.6157V14.0005C6.5625 13.5024 6.97266 13.063 7.5 13.063C7.99805 13.063 8.4375 13.5024 8.4375 14.0005V14.6157C10.1367 14.2642 11.4844 12.9165 11.8359 11.188H11.25C10.7227 11.188 10.3125 10.7778 10.3125 10.2505C10.3125 9.75244 10.7227 9.31299 11.25 9.31299H11.8359C11.4844 7.61377 10.1367 6.26611 8.4375 5.91455V6.50049C8.4375 7.02783 7.99805 7.43799 7.5 7.43799C6.97266 7.43799 6.5625 7.02783 6.5625 6.50049V5.91455C4.83398 6.26611 3.48633 7.61377 3.13477 9.31299H3.75C4.24805 9.31299 4.6875 9.75244 4.6875 10.2505C4.6875 10.7778 4.24805 11.188 3.75 11.188H3.13477ZM7.5 11.188C6.97266 11.188 6.5625 10.7778 6.5625 10.2505C6.5625 9.75244 6.97266 9.31299 7.5 9.31299C7.99805 9.31299 8.4375 9.75244 8.4375 10.2505C8.4375 10.7778 7.99805 11.188 7.5 11.188Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_target_light.svg b/client/public/themes/olympus/images/icons_roe_target_light.svg
new file mode 100644
index 00000000..9f8031ff
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_target_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 2.75049C7.99805 2.75049 8.4375 3.18994 8.4375 3.68799V4.01025C11.1621 4.42041 13.3301 6.58838 13.7402 9.31299H14.0625C14.5605 9.31299 15 9.75244 15 10.2505C15 10.7778 14.5605 11.188 14.0625 11.188H13.7402C13.3301 13.9419 11.1621 16.1099 8.4375 16.52V16.813C8.4375 17.3403 7.99805 17.7505 7.5 17.7505C6.97266 17.7505 6.5625 17.3403 6.5625 16.813V16.52C3.80859 16.1099 1.64062 13.9419 1.23047 11.188H0.9375C0.410156 11.188 0 10.7778 0 10.2505C0 9.75244 0.410156 9.31299 0.9375 9.31299H1.23047C1.64062 6.58838 3.80859 4.42041 6.5625 4.01025V3.68799C6.5625 3.18994 6.97266 2.75049 7.5 2.75049ZM3.13477 11.188C3.48633 12.9165 4.83398 14.2642 6.5625 14.6157V14.0005C6.5625 13.5024 6.97266 13.063 7.5 13.063C7.99805 13.063 8.4375 13.5024 8.4375 14.0005V14.6157C10.1367 14.2642 11.4844 12.9165 11.8359 11.188H11.25C10.7227 11.188 10.3125 10.7778 10.3125 10.2505C10.3125 9.75244 10.7227 9.31299 11.25 9.31299H11.8359C11.4844 7.61377 10.1367 6.26611 8.4375 5.91455V6.50049C8.4375 7.02783 7.99805 7.43799 7.5 7.43799C6.97266 7.43799 6.5625 7.02783 6.5625 6.50049V5.91455C4.83398 6.26611 3.48633 7.61377 3.13477 9.31299H3.75C4.24805 9.31299 4.6875 9.75244 4.6875 10.2505C4.6875 10.7778 4.24805 11.188 3.75 11.188H3.13477ZM7.5 11.188C6.97266 11.188 6.5625 10.7778 6.5625 10.2505C6.5625 9.75244 6.97266 9.31299 7.5 9.31299C7.99805 9.31299 8.4375 9.75244 8.4375 10.2505C8.4375 10.7778 7.99805 11.188 7.5 11.188Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_protect_dark.svg b/client/public/themes/olympus/images/icons_threat_protect_dark.svg
new file mode 100644
index 00000000..97c1deb0
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_protect_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 2.75049C7.61719 2.75049 7.76367 2.77979 7.88086 2.83838L13.3887 5.18213C14.0332 5.4751 14.5312 6.09033 14.5312 6.85205C14.502 9.78174 13.3008 15.0845 8.26172 17.5161C7.76367 17.7505 7.20703 17.7505 6.70898 17.5161C1.66992 15.0845 0.46875 9.78174 0.46875 6.85205C0.439453 6.09033 0.9375 5.4751 1.58203 5.18213L7.08984 2.83838C7.20703 2.77979 7.35352 2.75049 7.5 2.75049ZM7.5 4.71338V15.7876C11.543 13.8247 12.627 9.51807 12.6562 6.91064L7.5 4.71338Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_protect_light.svg b/client/public/themes/olympus/images/icons_threat_protect_light.svg
new file mode 100644
index 00000000..a3ae6b88
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_protect_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 2.75049C7.61719 2.75049 7.76367 2.77979 7.88086 2.83838L13.3887 5.18213C14.0332 5.4751 14.5312 6.09033 14.5312 6.85205C14.502 9.78174 13.3008 15.0845 8.26172 17.5161C7.76367 17.7505 7.20703 17.7505 6.70898 17.5161C1.66992 15.0845 0.46875 9.78174 0.46875 6.85205C0.439453 6.09033 0.9375 5.4751 1.58203 5.18213L7.08984 2.83838C7.20703 2.77979 7.35352 2.75049 7.5 2.75049ZM7.5 4.71338V15.7876C11.543 13.8247 12.627 9.51807 12.6562 6.91064L7.5 4.71338Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_retreat_dark.svg b/client/public/themes/olympus/images/icons_threat_retreat_dark.svg
new file mode 100644
index 00000000..cb31ee40
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_retreat_dark.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.66211 7.43799H5.15625C5.6543 7.43799 6.09375 7.87744 6.09375 8.37549C6.09375 8.90283 5.6543 9.31299 5.15625 9.31299H1.40625C0.878906 9.31299 0.46875 8.90283 0.46875 8.37549V4.62549C0.46875 4.12744 0.878906 3.68799 1.40625 3.68799C1.9043 3.68799 2.34375 4.12744 2.34375 4.62549V6.14893L2.8418 5.62158C5.41992 3.07275 9.55078 3.07275 12.1289 5.62158C14.6777 8.19971 14.6777 12.3306 12.1289 14.9087C9.55078 17.4575 5.41992 17.4575 2.8418 14.9087C2.49023 14.5278 2.49023 13.9419 2.8418 13.5903C3.22266 13.2095 3.80859 13.2095 4.16016 13.5903C6.00586 15.4067 8.96484 15.4067 10.8105 13.5903C12.627 11.7446 12.627 8.78564 10.8105 6.93994C8.96484 5.12354 6.00586 5.12354 4.16016 6.93994L3.66211 7.43799Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_retreat_light.svg b/client/public/themes/olympus/images/icons_threat_retreat_light.svg
new file mode 100644
index 00000000..e17d43f4
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_retreat_light.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="19" viewBox="0 0 15 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.66211 7.43799H5.15625C5.6543 7.43799 6.09375 7.87744 6.09375 8.37549C6.09375 8.90283 5.6543 9.31299 5.15625 9.31299H1.40625C0.878906 9.31299 0.46875 8.90283 0.46875 8.37549V4.62549C0.46875 4.12744 0.878906 3.68799 1.40625 3.68799C1.9043 3.68799 2.34375 4.12744 2.34375 4.62549V6.14893L2.8418 5.62158C5.41992 3.07275 9.55078 3.07275 12.1289 5.62158C14.6777 8.19971 14.6777 12.3306 12.1289 14.9087C9.55078 17.4575 5.41992 17.4575 2.8418 14.9087C2.49023 14.5278 2.49023 13.9419 2.8418 13.5903C3.22266 13.2095 3.80859 13.2095 4.16016 13.5903C6.00586 15.4067 8.96484 15.4067 10.8105 13.5903C12.627 11.7446 12.627 8.78564 10.8105 6.93994C8.96484 5.12354 6.00586 5.12354 4.16016 6.93994L3.66211 7.43799Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
index 3a78af31..7f69c0e6 100644
--- a/client/views/unitcontrolpanel.ejs
+++ b/client/views/unitcontrolpanel.ejs
@@ -56,8 +56,12 @@
         </div>
 
         <div id="loadout-data" class="panel-section">
-            <h4 id="loadout-label">Loadout</h4>
-            <div id="loadout-container" class="ol-scroll"></div>
+            <h4 id="loadout-label">Loadout<span id="loadout-fuel-level" data-fuel-level="69"></span></h4>
+            <div id="loadout-container" class="ol-group">
+                <div class="pill loadout-item" data-qty="2" data-item="AIM-120B"></div>
+                <div class="pill loadout-item" data-qty="2" data-item="AIM-9P"></div>
+                <div class="pill loadout-item" data-qty="100" data-item="AIM-120B"></div>
+            </div>
         </div>
     </div>