From 0fa3f363516dc2390b10cc5fc40c5486626830de Mon Sep 17 00:00:00 2001
From: Dogma <103559271+ArtificialDogma@users.noreply.github.com>
Date: Sat, 25 Mar 2023 14:36:11 +1100
Subject: [PATCH] Multiple icon additions and changes

Made multiple additions and changes to icons.
Note: made all menu icons 35x35 px (except the new bomb icon, which is a unit icon - these are still 50x50 px) to ensure correct alignment and sizing.
ROE and Threat changed as per the discussion in discord based on the following final list:

ROE:
Attack all
Attack target only
Defend
Hold

Reaction:
Manoeuvre and countermeasures
Countermeasures only
None

Changes include:
- Added new bomb icon (blue, red, neutral).
- Updated ROE icons (roe_stop, roe_defend, roe_target, roe_attack)
- Updated threat icons (threat_nothing, threat_cms, threat_defend)
- Updated formation icons (form_admin, form_abreast, form_echelon, form_trail)
- Updated action icons (actions_cancel, actions_rtb, actions_gas, actions_180)
- Added misc icons, including settings, gas, plane, map, visible and brush.
---
 .../themes/olympus/images/icon_bomb_blue.svg  | 55 +------------------
 .../olympus/images/icon_bomb_neutral.svg      | 55 +------------------
 .../themes/olympus/images/icon_bomb_red.svg   | 55 +------------------
 .../olympus/images/icons_actions_180_dark.svg |  4 ++
 .../images/icons_actions_180_light.svg        |  4 ++
 .../images/icons_actions_cancel_dark.svg      |  3 +
 .../images/icons_actions_cancel_light.svg     |  3 +
 .../olympus/images/icons_actions_gas_dark.svg |  4 +-
 .../images/icons_actions_gas_light.svg        |  4 +-
 .../olympus/images/icons_actions_rtb_dark.svg |  4 +-
 .../images/icons_actions_rtb_light.svg        |  4 +-
 .../images/icons_form_abreast_dark.svg        |  8 +--
 .../images/icons_form_abreast_light.svg       |  8 +--
 .../olympus/images/icons_form_admin_dark.svg  |  6 +-
 .../olympus/images/icons_form_admin_light.svg |  6 +-
 .../images/icons_form_echelon_dark.svg        |  7 ++-
 .../images/icons_form_echelon_light.svg       |  7 ++-
 .../olympus/images/icons_form_trail_dark.svg  |  7 ++-
 .../olympus/images/icons_form_trail_light.svg |  7 ++-
 .../olympus/images/icons_misc_brush_blue.svg  |  3 +
 .../olympus/images/icons_misc_brush_dark.svg  |  3 +
 .../olympus/images/icons_misc_brush_light.svg |  3 +
 .../olympus/images/icons_misc_gas_blue.svg    |  3 +
 .../olympus/images/icons_misc_gas_dark.svg    |  3 +
 .../olympus/images/icons_misc_gas_light.svg   |  3 +
 .../olympus/images/icons_misc_map_blue.svg    |  3 +
 .../olympus/images/icons_misc_map_dark.svg    |  3 +
 .../olympus/images/icons_misc_map_light.svg   |  3 +
 .../olympus/images/icons_misc_plane_blue.svg  |  3 +
 .../olympus/images/icons_misc_plane_dark.svg  |  3 +
 .../olympus/images/icons_misc_plane_light.svg |  3 +
 .../images/icons_misc_settings_blue.svg       |  3 +
 .../images/icons_misc_settings_dark.svg       |  3 +
 .../images/icons_misc_settings_light.svg      |  3 +
 .../images/icons_misc_visible_blue.svg        |  3 +
 .../images/icons_misc_visible_dark.svg        |  3 +
 .../images/icons_misc_visible_light.svg       |  3 +
 .../olympus/images/icons_roe_attack_dark.svg  | 10 ++++
 .../olympus/images/icons_roe_attack_light.svg | 10 ++++
 .../olympus/images/icons_roe_defend_dark.svg  |  3 +
 .../olympus/images/icons_roe_defend_light.svg |  3 +
 .../olympus/images/icons_roe_stop_dark.svg    |  4 +-
 .../olympus/images/icons_roe_stop_light.svg   |  4 +-
 .../olympus/images/icons_roe_target_dark.svg  |  4 +-
 .../olympus/images/icons_roe_target_light.svg |  4 +-
 .../olympus/images/icons_threat_cms_dark.svg  |  8 +++
 .../olympus/images/icons_threat_cms_light.svg |  8 +++
 .../images/icons_threat_defend_dark.svg       |  7 +++
 .../images/icons_threat_defend_light.svg      |  7 +++
 .../images/icons_threat_nothing_dark.svg      |  3 +
 .../images/icons_threat_nothing_light.svg     |  3 +
 51 files changed, 182 insertions(+), 201 deletions(-)
 create mode 100644 client/public/themes/olympus/images/icons_actions_180_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_actions_180_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_actions_cancel_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_actions_cancel_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_brush_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_brush_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_brush_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_gas_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_gas_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_gas_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_map_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_map_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_map_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_plane_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_plane_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_plane_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_settings_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_settings_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_settings_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_visible_blue.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_visible_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_misc_visible_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_roe_attack_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_roe_attack_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_roe_defend_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_roe_defend_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_cms_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_cms_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_defend_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_defend_light.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_nothing_dark.svg
 create mode 100644 client/public/themes/olympus/images/icons_threat_nothing_light.svg

diff --git a/client/public/themes/olympus/images/icon_bomb_blue.svg b/client/public/themes/olympus/images/icon_bomb_blue.svg
index debb288f..136deb4f 100644
--- a/client/public/themes/olympus/images/icon_bomb_blue.svg
+++ b/client/public/themes/olympus/images/icon_bomb_blue.svg
@@ -1,54 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="50"
-   height="50"
-   viewBox="0 0 50 50"
-   fill="none"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="icon_bomb_blue.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="11.766257"
-     inkscape:cx="22.139581"
-     inkscape:cy="24.689245"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
-  <path
-     d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
-     fill="#3bb9ff"
-     stroke="#082e44"
-     stroke-width="1.81059"
-     id="path2"
-     sodipodi:nodetypes="zzcczz" />
-  <path
-     d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
-     fill="#082e44"
-     id="path4"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
-  <path
-     d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
-     fill="#082e44"
-     id="path4-2"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.86 33.5C19.8652 26 20.293 15 24.9991 12C29.7052 15.5 29.7052 27 27.1382 33.5C27.1382 33.5 28.7905 34.0138 29.2774 35C29.7783 36.0148 29.2774 38 29.2774 38H20.721C20.721 38 20.2237 36.0172 20.721 35C21.2771 33.8627 22.86 33.5 22.86 33.5Z" fill="#5CA7FF" stroke="#082E44" stroke-width="2"/>
 </svg>
diff --git a/client/public/themes/olympus/images/icon_bomb_neutral.svg b/client/public/themes/olympus/images/icon_bomb_neutral.svg
index 1111d0c2..e32f31b9 100644
--- a/client/public/themes/olympus/images/icon_bomb_neutral.svg
+++ b/client/public/themes/olympus/images/icon_bomb_neutral.svg
@@ -1,54 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="50"
-   height="50"
-   viewBox="0 0 50 50"
-   fill="none"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="icon_bomb_blue.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="11.766257"
-     inkscape:cx="22.139581"
-     inkscape:cy="24.689245"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
-  <path
-     d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
-     fill="#CFD9E8"
-     stroke="#082e44"
-     stroke-width="1.81059"
-     id="path2"
-     sodipodi:nodetypes="zzcczz" />
-  <path
-     d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
-     fill="#082e44"
-     id="path4"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
-  <path
-     d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
-     fill="#082e44"
-     id="path4-2"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.86 33.5C19.8652 26 20.293 15 24.9991 12C29.7052 15.5 29.7052 27 27.1382 33.5C27.1382 33.5 28.7905 34.0138 29.2774 35C29.7783 36.0148 29.2774 38 29.2774 38H20.721C20.721 38 20.2237 36.0172 20.721 35C21.2771 33.8627 22.86 33.5 22.86 33.5Z" fill="#CFD9E8" stroke="#2F2F2F" stroke-width="2"/>
 </svg>
diff --git a/client/public/themes/olympus/images/icon_bomb_red.svg b/client/public/themes/olympus/images/icon_bomb_red.svg
index 67e2b9fc..c86bf6f4 100644
--- a/client/public/themes/olympus/images/icon_bomb_red.svg
+++ b/client/public/themes/olympus/images/icon_bomb_red.svg
@@ -1,54 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="50"
-   height="50"
-   viewBox="0 0 50 50"
-   fill="none"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="icon_bomb_blue.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="11.766257"
-     inkscape:cx="22.139581"
-     inkscape:cy="24.689245"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
-  <path
-     d="m 24.9348,12.27041 c 1.781649,0 2.774707,2.202308 2.833594,7.603552 0.05889,5.401244 -2.283654,16.513641 -2.283654,16.513641 h -1.039784 c 0,0 -2.188799,-11.37979 -2.19351,-16.573737 -0.0047,-5.193947 0.901705,-7.543456 2.683354,-7.543456 z"
-     fill="#FF5858"
-     stroke="#262222"
-     stroke-width="1.81059"
-     id="path2"
-     sodipodi:nodetypes="zzcczz" />
-  <path
-     d="m 23.573821,31.288106 0.871135,5.099497 -5.000516,-2.740929 z"
-     fill="#262222"
-     id="path4"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
-  <path
-     d="m 25.48474,36.387603 0.871136,-5.078251 4.12938,2.337232 z"
-     fill="#262222"
-     id="path4-2"
-     style="stroke-width:0.928076"
-     sodipodi:nodetypes="cccc" />
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.86 33.5C19.8652 26 20.293 15 24.9991 12C29.7052 15.5 29.7052 27 27.1382 33.5C27.1382 33.5 28.7905 34.0138 29.2774 35C29.7783 36.0148 29.2774 38 29.2774 38H20.721C20.721 38 20.2237 36.0172 20.721 35C21.2771 33.8627 22.86 33.5 22.86 33.5Z" fill="#FF5858" stroke="#262222" stroke-width="2"/>
 </svg>
diff --git a/client/public/themes/olympus/images/icons_actions_180_dark.svg b/client/public/themes/olympus/images/icons_actions_180_dark.svg
new file mode 100644
index 00000000..79e0ade7
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_180_dark.svg
@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.4955 18.2238C12.7115 15.3416 13.888 9.51496 16.8654 9.26602C20.5872 8.95485 25.1646 8.07764 24.7964 21.0345" stroke="#202831" stroke-linecap="round" stroke-dasharray="2 2"/>
+<path d="M11.8419 26.3021C11.8812 26.3949 11.9723 26.4546 12.0729 26.4546C12.1735 26.4546 12.2646 26.3949 12.3039 26.3021L12.997 24.685C13.0504 24.5592 13.0787 24.4257 13.0787 24.2889L13.0787 23.0788L15.3418 21.7587L15.3418 22.0541C15.3418 22.2631 15.51 22.4313 15.719 22.4313C15.928 22.4313 16.0962 22.2631 16.0962 22.0541L16.0962 21.174L16.0962 20.6711L16.0962 20.2939C16.0962 20.0849 15.928 19.9167 15.719 19.9167C15.51 19.9167 15.3418 20.0849 15.3418 20.2939L15.3418 20.4197L13.0787 20.4197L13.0787 19.9058L13.9981 19.0995C14.0531 19.0523 14.0845 18.9832 14.0845 18.9109L14.0845 18.6595C14.0845 18.5212 13.9714 18.408 13.8331 18.408L12.3244 18.408L12.3244 19.4138C12.3244 19.5521 12.2112 19.6653 12.0729 19.6653C11.9346 19.6653 11.8214 19.5521 11.8214 19.4138L11.8214 18.408L10.3127 18.408C10.1744 18.408 10.0613 18.5212 10.0613 18.6595L10.0613 18.9109C10.0613 18.9832 10.0926 19.0523 10.1477 19.0995L11.0671 19.9058L11.0671 20.4197L8.80398 20.4197L8.80398 20.2939C8.80398 20.0849 8.6358 19.9167 8.42679 19.9167C8.21778 19.9167 8.04961 20.0849 8.04961 20.2939L8.04961 20.6711L8.04961 21.174L8.04961 22.0541C8.04961 22.2631 8.21778 22.4313 8.42679 22.4313C8.6358 22.4313 8.80398 22.2631 8.80398 22.0541L8.80398 21.7587L11.0671 23.0788L11.0671 24.2889C11.0671 24.4257 11.0954 24.5592 11.1488 24.685L11.8419 26.3021Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_180_light.svg b/client/public/themes/olympus/images/icons_actions_180_light.svg
new file mode 100644
index 00000000..2db2cb63
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_180_light.svg
@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.4955 18.2238C12.7115 15.3416 13.888 9.51496 16.8654 9.26602C20.5872 8.95485 25.1646 8.07764 24.7964 21.0345" stroke="#5CA7FF" stroke-linecap="round" stroke-dasharray="2 2"/>
+<path d="M11.8419 26.3021C11.8812 26.3949 11.9723 26.4546 12.0729 26.4546C12.1735 26.4546 12.2646 26.3949 12.3039 26.3021L12.997 24.685C13.0504 24.5592 13.0787 24.4257 13.0787 24.2889L13.0787 23.0788L15.3418 21.7587L15.3418 22.0541C15.3418 22.2631 15.51 22.4313 15.719 22.4313C15.928 22.4313 16.0962 22.2631 16.0962 22.0541L16.0962 21.174L16.0962 20.6711L16.0962 20.2939C16.0962 20.0849 15.928 19.9167 15.719 19.9167C15.51 19.9167 15.3418 20.0849 15.3418 20.2939L15.3418 20.4197L13.0787 20.4197L13.0787 19.9058L13.9981 19.0995C14.0531 19.0523 14.0845 18.9832 14.0845 18.9109L14.0845 18.6595C14.0845 18.5212 13.9714 18.408 13.8331 18.408L12.3244 18.408L12.3244 19.4138C12.3244 19.5521 12.2112 19.6653 12.0729 19.6653C11.9346 19.6653 11.8214 19.5521 11.8214 19.4138L11.8214 18.408L10.3127 18.408C10.1744 18.408 10.0613 18.5212 10.0613 18.6595L10.0613 18.9109C10.0613 18.9832 10.0926 19.0523 10.1477 19.0995L11.0671 19.9058L11.0671 20.4197L8.80398 20.4197L8.80398 20.2939C8.80398 20.0849 8.6358 19.9167 8.42679 19.9167C8.21778 19.9167 8.04961 20.0849 8.04961 20.2939L8.04961 20.6711L8.04961 21.174L8.04961 22.0541C8.04961 22.2631 8.21778 22.4313 8.42679 22.4313C8.6358 22.4313 8.80398 22.2631 8.80398 22.0541L8.80398 21.7587L11.0671 23.0788L11.0671 24.2889C11.0671 24.4257 11.0954 24.5592 11.1488 24.685L11.8419 26.3021Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_cancel_dark.svg b/client/public/themes/olympus/images/icons_actions_cancel_dark.svg
new file mode 100644
index 00000000..3582a48c
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_cancel_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_cancel_light.svg b/client/public/themes/olympus/images/icons_actions_cancel_light.svg
new file mode 100644
index 00000000..dc3335a8
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_actions_cancel_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_actions_gas_dark.svg b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
index feee9f86..4a5d7357 100644
--- a/client/public/themes/olympus/images/icons_actions_gas_dark.svg
+++ b/client/public/themes/olympus/images/icons_actions_gas_dark.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.25 13.5C12.25 12.6797 12.9062 12 13.75 12H17.5C18.3203 12 19 12.6797 19 13.5V18H19.1875C20.3125 18 21.25 18.9375 21.25 20.0625V20.8125C21.25 21.1406 21.4844 21.375 21.8125 21.375C22.1172 21.375 22.375 21.1406 22.375 20.8125V17.2031C21.7188 17.0391 21.25 16.4531 21.25 15.75V14.25L20.5 13.5C20.2891 13.3125 20.2891 12.9609 20.5 12.75C20.6875 12.5625 21.0391 12.5625 21.25 12.75L23.0547 14.5781C23.3359 14.8594 23.5 15.2344 23.5 15.6328V15.9375V16.5V17.25V20.8125C23.5 21.75 22.7266 22.5 21.8125 22.5C20.875 22.5 20.125 21.75 20.125 20.8125V20.0625C20.125 19.5469 19.7031 19.125 19.1875 19.125H19V22.5C19.3984 22.5 19.75 22.8516 19.75 23.25C19.75 23.6719 19.3984 24 19 24H12.25C11.8281 24 11.5 23.6719 11.5 23.25C11.5 22.8516 11.8281 22.5 12.25 22.5V13.5ZM13.75 13.875V16.125C13.75 16.3359 13.9141 16.5 14.125 16.5H17.125C17.3125 16.5 17.5 16.3359 17.5 16.125V13.875C17.5 13.6875 17.3125 13.5 17.125 13.5H14.125C13.9141 13.5 13.75 13.6875 13.75 13.875Z" 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
index f9c9ebd0..14bbef19 100644
--- a/client/public/themes/olympus/images/icons_actions_gas_light.svg
+++ b/client/public/themes/olympus/images/icons_actions_gas_light.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.25 13.5C12.25 12.6797 12.9062 12 13.75 12H17.5C18.3203 12 19 12.6797 19 13.5V18H19.1875C20.3125 18 21.25 18.9375 21.25 20.0625V20.8125C21.25 21.1406 21.4844 21.375 21.8125 21.375C22.1172 21.375 22.375 21.1406 22.375 20.8125V17.2031C21.7188 17.0391 21.25 16.4531 21.25 15.75V14.25L20.5 13.5C20.2891 13.3125 20.2891 12.9609 20.5 12.75C20.6875 12.5625 21.0391 12.5625 21.25 12.75L23.0547 14.5781C23.3359 14.8594 23.5 15.2344 23.5 15.6328V15.9375V16.5V17.25V20.8125C23.5 21.75 22.7266 22.5 21.8125 22.5C20.875 22.5 20.125 21.75 20.125 20.8125V20.0625C20.125 19.5469 19.7031 19.125 19.1875 19.125H19V22.5C19.3984 22.5 19.75 22.8516 19.75 23.25C19.75 23.6719 19.3984 24 19 24H12.25C11.8281 24 11.5 23.6719 11.5 23.25C11.5 22.8516 11.8281 22.5 12.25 22.5V13.5ZM13.75 13.875V16.125C13.75 16.3359 13.9141 16.5 14.125 16.5H17.125C17.3125 16.5 17.5 16.3359 17.5 16.125V13.875C17.5 13.6875 17.3125 13.5 17.125 13.5H14.125C13.9141 13.5 13.75 13.6875 13.75 13.875Z" 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
index c3682f22..081bff14 100644
--- a/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
+++ b/client/public/themes/olympus/images/icons_actions_rtb_dark.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.5996 17.625C24.5996 18.082 24.2188 18.4375 23.7871 18.4375H22.9746L23 22.5C23 22.5762 23 22.6523 23 22.7031V23.1094C23 23.6934 22.543 24.125 21.9844 24.125H21.5781C21.5273 24.125 21.502 24.125 21.4766 24.125C21.4512 24.125 21.4004 24.125 21.375 24.125H20.5625H19.9531C19.3691 24.125 18.9375 23.6934 18.9375 23.1094V22.5V20.875C18.9375 20.4434 18.5566 20.0625 18.125 20.0625H16.5C16.043 20.0625 15.6875 20.4434 15.6875 20.875V22.5V23.1094C15.6875 23.6934 15.2305 24.125 14.6719 24.125H14.0625H13.25C13.1992 24.125 13.1738 24.125 13.123 24.125C13.0977 24.125 13.0723 24.125 13.0469 24.125H12.6406C12.0566 24.125 11.625 23.6934 11.625 23.1094V20.2656C11.625 20.2656 11.625 20.2402 11.625 20.2148V18.4375H10.8125C10.3555 18.4375 10 18.082 10 17.625C10 17.3965 10.0762 17.1934 10.2539 17.0156L16.7539 11.3281C16.9316 11.1504 17.1348 11.125 17.3125 11.125C17.4902 11.125 17.6934 11.1758 17.8457 11.3027L24.3203 17.0156C24.5234 17.1934 24.625 17.3965 24.5996 17.625Z" 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
index 0c9231e3..9147bcc5 100644
--- a/client/public/themes/olympus/images/icons_actions_rtb_light.svg
+++ b/client/public/themes/olympus/images/icons_actions_rtb_light.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.5996 17.625C24.5996 18.082 24.2188 18.4375 23.7871 18.4375H22.9746L23 22.5C23 22.5762 23 22.6523 23 22.7031V23.1094C23 23.6934 22.543 24.125 21.9844 24.125H21.5781C21.5273 24.125 21.502 24.125 21.4766 24.125C21.4512 24.125 21.4004 24.125 21.375 24.125H20.5625H19.9531C19.3691 24.125 18.9375 23.6934 18.9375 23.1094V22.5V20.875C18.9375 20.4434 18.5566 20.0625 18.125 20.0625H16.5C16.043 20.0625 15.6875 20.4434 15.6875 20.875V22.5V23.1094C15.6875 23.6934 15.2305 24.125 14.6719 24.125H14.0625H13.25C13.1992 24.125 13.1738 24.125 13.123 24.125C13.0977 24.125 13.0723 24.125 13.0469 24.125H12.6406C12.0566 24.125 11.625 23.6934 11.625 23.1094V20.2656C11.625 20.2656 11.625 20.2402 11.625 20.2148V18.4375H10.8125C10.3555 18.4375 10 18.082 10 17.625C10 17.3965 10.0762 17.1934 10.2539 17.0156L16.7539 11.3281C16.9316 11.1504 17.1348 11.125 17.3125 11.125C17.4902 11.125 17.6934 11.1758 17.8457 11.3027L24.3203 17.0156C24.5234 17.1934 24.625 17.3965 24.5996 17.625Z" 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
index c528c451..513d6b25 100644
--- a/client/public/themes/olympus/images/icons_form_abreast_dark.svg
+++ b/client/public/themes/olympus/images/icons_form_abreast_dark.svg
@@ -1,5 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.7297 13.6516C26.6906 13.5594 26.6 13.5 26.5 13.5C26.4 13.5 26.3094 13.5594 26.2703 13.6516L25.5812 15.2594C25.5281 15.3844 25.5 15.5172 25.5 15.6531V16.8563L23.25 18.1687V17.875C23.25 17.6672 23.0828 17.5 22.875 17.5C22.6672 17.5 22.5 17.6672 22.5 17.875V18.75V19.25V19.625C22.5 19.8328 22.6672 20 22.875 20C23.0828 20 23.25 19.8328 23.25 19.625V19.5H25.5V20.0109L24.5859 20.8125C24.5312 20.8594 24.5 20.9281 24.5 21V21.25C24.5 21.3875 24.6125 21.5 24.75 21.5H26.25V20.5C26.25 20.3625 26.3625 20.25 26.5 20.25C26.6375 20.25 26.75 20.3625 26.75 20.5V21.5H28.25C28.3875 21.5 28.5 21.3875 28.5 21.25V21C28.5 20.9281 28.4688 20.8594 28.4141 20.8125L27.5 20.0109V19.5H29.75V19.625C29.75 19.8328 29.9172 20 30.125 20C30.3328 20 30.5 19.8328 30.5 19.625V19.25V18.75V17.875C30.5 17.6672 30.3328 17.5 30.125 17.5C29.9172 17.5 29.75 17.6672 29.75 17.875V18.1687L27.5 16.8563V15.6531C27.5 15.5172 27.4719 15.3844 27.4187 15.2594L26.7297 13.6516Z" fill="#202831"/>
+<path d="M9.72969 13.6516C9.69063 13.5594 9.6 13.5 9.5 13.5C9.4 13.5 9.30938 13.5594 9.27031 13.6516L8.58125 15.2594C8.52812 15.3844 8.5 15.5172 8.5 15.6531V16.8563L6.25 18.1687V17.875C6.25 17.6672 6.08281 17.5 5.875 17.5C5.66719 17.5 5.5 17.6672 5.5 17.875V18.75V19.25V19.625C5.5 19.8328 5.66719 20 5.875 20C6.08281 20 6.25 19.8328 6.25 19.625V19.5H8.5V20.0109L7.58594 20.8125C7.53125 20.8594 7.5 20.9281 7.5 21V21.25C7.5 21.3875 7.6125 21.5 7.75 21.5H9.25V20.5C9.25 20.3625 9.3625 20.25 9.5 20.25C9.6375 20.25 9.75 20.3625 9.75 20.5V21.5H11.25C11.3875 21.5 11.5 21.3875 11.5 21.25V21C11.5 20.9281 11.4687 20.8594 11.4141 20.8125L10.5 20.0109V19.5H12.75V19.625C12.75 19.8328 12.9172 20 13.125 20C13.3328 20 13.5 19.8328 13.5 19.625V19.25V18.75V17.875C13.5 17.6672 13.3328 17.5 13.125 17.5C12.9172 17.5 12.75 17.6672 12.75 17.875V18.1687L10.5 16.8563V15.6531C10.5 15.5172 10.4719 15.3844 10.4187 15.2594L9.72969 13.6516Z" fill="#202831"/>
+<path d="M16 19H20" 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
index 2408169f..0b302a04 100644
--- a/client/public/themes/olympus/images/icons_form_abreast_light.svg
+++ b/client/public/themes/olympus/images/icons_form_abreast_light.svg
@@ -1,5 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.7297 13.6516C26.6906 13.5594 26.6 13.5 26.5 13.5C26.4 13.5 26.3094 13.5594 26.2703 13.6516L25.5812 15.2594C25.5281 15.3844 25.5 15.5172 25.5 15.6531V16.8563L23.25 18.1687V17.875C23.25 17.6672 23.0828 17.5 22.875 17.5C22.6672 17.5 22.5 17.6672 22.5 17.875V18.75V19.25V19.625C22.5 19.8328 22.6672 20 22.875 20C23.0828 20 23.25 19.8328 23.25 19.625V19.5H25.5V20.0109L24.5859 20.8125C24.5312 20.8594 24.5 20.9281 24.5 21V21.25C24.5 21.3875 24.6125 21.5 24.75 21.5H26.25V20.5C26.25 20.3625 26.3625 20.25 26.5 20.25C26.6375 20.25 26.75 20.3625 26.75 20.5V21.5H28.25C28.3875 21.5 28.5 21.3875 28.5 21.25V21C28.5 20.9281 28.4688 20.8594 28.4141 20.8125L27.5 20.0109V19.5H29.75V19.625C29.75 19.8328 29.9172 20 30.125 20C30.3328 20 30.5 19.8328 30.5 19.625V19.25V18.75V17.875C30.5 17.6672 30.3328 17.5 30.125 17.5C29.9172 17.5 29.75 17.6672 29.75 17.875V18.1687L27.5 16.8563V15.6531C27.5 15.5172 27.4719 15.3844 27.4187 15.2594L26.7297 13.6516Z" fill="#5CA7FF"/>
+<path d="M9.72969 13.6516C9.69063 13.5594 9.6 13.5 9.5 13.5C9.4 13.5 9.30938 13.5594 9.27031 13.6516L8.58125 15.2594C8.52812 15.3844 8.5 15.5172 8.5 15.6531V16.8563L6.25 18.1687V17.875C6.25 17.6672 6.08281 17.5 5.875 17.5C5.66719 17.5 5.5 17.6672 5.5 17.875V18.75V19.25V19.625C5.5 19.8328 5.66719 20 5.875 20C6.08281 20 6.25 19.8328 6.25 19.625V19.5H8.5V20.0109L7.58594 20.8125C7.53125 20.8594 7.5 20.9281 7.5 21V21.25C7.5 21.3875 7.6125 21.5 7.75 21.5H9.25V20.5C9.25 20.3625 9.3625 20.25 9.5 20.25C9.6375 20.25 9.75 20.3625 9.75 20.5V21.5H11.25C11.3875 21.5 11.5 21.3875 11.5 21.25V21C11.5 20.9281 11.4687 20.8594 11.4141 20.8125L10.5 20.0109V19.5H12.75V19.625C12.75 19.8328 12.9172 20 13.125 20C13.3328 20 13.5 19.8328 13.5 19.625V19.25V18.75V17.875C13.5 17.6672 13.3328 17.5 13.125 17.5C12.9172 17.5 12.75 17.6672 12.75 17.875V18.1687L10.5 16.8563V15.6531C10.5 15.5172 10.4719 15.3844 10.4187 15.2594L9.72969 13.6516Z" fill="#5CA7FF"/>
+<path d="M16 19H20" 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
index 49d375dd..44e42f62 100644
--- a/client/public/themes/olympus/images/icons_form_admin_dark.svg
+++ b/client/public/themes/olympus/images/icons_form_admin_dark.svg
@@ -1,4 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.2083 7.41405C12.1445 7.26349 11.9965 7.1665 11.8331 7.1665C11.6698 7.1665 11.5218 7.26349 11.458 7.41405L10.3325 10.0402C10.2457 10.2443 10.1998 10.4612 10.1998 10.6833V12.6483L6.5248 14.7921V14.3123C6.5248 13.9729 6.25173 13.6998 5.9123 13.6998C5.57288 13.6998 5.2998 13.9729 5.2998 14.3123V15.7415V16.5582V17.1707C5.2998 17.5101 5.57288 17.7832 5.9123 17.7832C6.25173 17.7832 6.5248 17.5101 6.5248 17.1707V16.9665H10.1998V17.801L8.70684 19.1103C8.61752 19.1868 8.56647 19.2991 8.56647 19.4165V19.8248C8.56647 20.0494 8.75022 20.2332 8.9748 20.2332H11.4248V18.5998C11.4248 18.3753 11.6086 18.1915 11.8331 18.1915C12.0577 18.1915 12.2415 18.3753 12.2415 18.5998V20.2332H14.6915C14.916 20.2332 15.0998 20.0494 15.0998 19.8248V19.4165C15.0998 19.2991 15.0488 19.1868 14.9594 19.1103L13.4665 17.801V16.9665H17.1415V17.1707C17.1415 17.5101 17.4146 17.7832 17.754 17.7832C18.0934 17.7832 18.3665 17.5101 18.3665 17.1707V16.5582V15.7415V14.3123C18.3665 13.9729 18.0934 13.6998 17.754 13.6998C17.4146 13.6998 17.1415 13.9729 17.1415 14.3123V14.7921L13.4665 12.6483V10.6833C13.4665 10.4612 13.4206 10.2443 13.3338 10.0402L12.2083 7.41405Z" fill="#202831"/>
+<path d="M22.8732 15.8329C22.8097 15.7061 22.6625 15.6245 22.5 15.6245C22.3375 15.6245 22.1903 15.7061 22.1268 15.8329L21.0071 18.0436C20.9207 18.2155 20.875 18.3981 20.875 18.585V20.2393L17.2188 22.044V21.6401C17.2188 21.3544 16.9471 21.1245 16.6094 21.1245C16.2717 21.1245 16 21.3544 16 21.6401V22.8433V23.5307V24.0464C16 24.3321 16.2717 24.562 16.6094 24.562C16.9471 24.562 17.2188 24.3321 17.2188 24.0464V23.8745H20.875V24.577L19.3896 25.6792C19.3008 25.7436 19.25 25.8382 19.25 25.937V26.2807C19.25 26.4698 19.4328 26.6245 19.6563 26.6245H22.0938V25.2495C22.0938 25.0604 22.2765 24.9057 22.5 24.9057C22.7235 24.9057 22.9063 25.0604 22.9063 25.2495V26.6245H25.3438C25.5672 26.6245 25.75 26.4698 25.75 26.2807V25.937C25.75 25.8382 25.6992 25.7436 25.6104 25.6792L24.125 24.577V23.8745H27.7813V24.0464C27.7813 24.3321 28.053 24.562 28.3906 24.562C28.7283 24.562 29 24.3321 29 24.0464V23.5307V22.8433V21.6401C29 21.3544 28.7283 21.1245 28.3906 21.1245C28.053 21.1245 27.7813 21.3544 27.7813 21.6401V22.044L24.125 20.2393V18.585C24.125 18.3981 24.0793 18.2155 23.9929 18.0436L22.8732 15.8329Z" 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
index dbf4f074..532c523f 100644
--- a/client/public/themes/olympus/images/icons_form_admin_light.svg
+++ b/client/public/themes/olympus/images/icons_form_admin_light.svg
@@ -1,4 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.2083 7.41405C12.1445 7.26349 11.9965 7.1665 11.8331 7.1665C11.6698 7.1665 11.5218 7.26349 11.458 7.41405L10.3325 10.0402C10.2457 10.2443 10.1998 10.4612 10.1998 10.6833V12.6483L6.5248 14.7921V14.3123C6.5248 13.9729 6.25173 13.6998 5.9123 13.6998C5.57288 13.6998 5.2998 13.9729 5.2998 14.3123V15.7415V16.5582V17.1707C5.2998 17.5101 5.57288 17.7832 5.9123 17.7832C6.25173 17.7832 6.5248 17.5101 6.5248 17.1707V16.9665H10.1998V17.801L8.70684 19.1103C8.61752 19.1868 8.56647 19.2991 8.56647 19.4165V19.8248C8.56647 20.0494 8.75022 20.2332 8.9748 20.2332H11.4248V18.5998C11.4248 18.3753 11.6086 18.1915 11.8331 18.1915C12.0577 18.1915 12.2415 18.3753 12.2415 18.5998V20.2332H14.6915C14.916 20.2332 15.0998 20.0494 15.0998 19.8248V19.4165C15.0998 19.2991 15.0488 19.1868 14.9594 19.1103L13.4665 17.801V16.9665H17.1415V17.1707C17.1415 17.5101 17.4146 17.7832 17.754 17.7832C18.0934 17.7832 18.3665 17.5101 18.3665 17.1707V16.5582V15.7415V14.3123C18.3665 13.9729 18.0934 13.6998 17.754 13.6998C17.4146 13.6998 17.1415 13.9729 17.1415 14.3123V14.7921L13.4665 12.6483V10.6833C13.4665 10.4612 13.4206 10.2443 13.3338 10.0402L12.2083 7.41405Z" fill="#5CA7FF"/>
+<path d="M22.8732 15.8329C22.8097 15.7061 22.6625 15.6245 22.5 15.6245C22.3375 15.6245 22.1903 15.7061 22.1268 15.8329L21.0071 18.0436C20.9207 18.2155 20.875 18.3981 20.875 18.585V20.2393L17.2188 22.044V21.6401C17.2188 21.3544 16.9471 21.1245 16.6094 21.1245C16.2717 21.1245 16 21.3544 16 21.6401V22.8433V23.5307V24.0464C16 24.3321 16.2717 24.562 16.6094 24.562C16.9471 24.562 17.2188 24.3321 17.2188 24.0464V23.8745H20.875V24.577L19.3896 25.6792C19.3008 25.7436 19.25 25.8382 19.25 25.937V26.2807C19.25 26.4698 19.4328 26.6245 19.6563 26.6245H22.0938V25.2495C22.0938 25.0604 22.2765 24.9057 22.5 24.9057C22.7235 24.9057 22.9063 25.0604 22.9063 25.2495V26.6245H25.3438C25.5672 26.6245 25.75 26.4698 25.75 26.2807V25.937C25.75 25.8382 25.6992 25.7436 25.6104 25.6792L24.125 24.577V23.8745H27.7813V24.0464C27.7813 24.3321 28.053 24.562 28.3906 24.562C28.7283 24.562 29 24.3321 29 24.0464V23.5307V22.8433V21.6401C29 21.3544 28.7283 21.1245 28.3906 21.1245C28.053 21.1245 27.7813 21.3544 27.7813 21.6401V22.044L24.125 20.2393V18.585C24.125 18.3981 24.0793 18.2155 23.9929 18.0436L22.8732 15.8329Z" 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
index 25144e4f..dc4b4b60 100644
--- a/client/public/themes/olympus/images/icons_form_echelon_dark.svg
+++ b/client/public/themes/olympus/images/icons_form_echelon_dark.svg
@@ -1,4 +1,5 @@
-<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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.7297 18.6516C23.6906 18.5594 23.6 18.5 23.5 18.5C23.4 18.5 23.3094 18.5594 23.2703 18.6516L22.5812 20.2594C22.5281 20.3844 22.5 20.5172 22.5 20.6531V21.8563L20.25 23.1687V22.875C20.25 22.6672 20.0828 22.5 19.875 22.5C19.6672 22.5 19.5 22.6672 19.5 22.875V23.75V24.25V24.625C19.5 24.8328 19.6672 25 19.875 25C20.0828 25 20.25 24.8328 20.25 24.625V24.5H22.5V25.0109L21.5859 25.8125C21.5312 25.8594 21.5 25.9281 21.5 26V26.25C21.5 26.3875 21.6125 26.5 21.75 26.5H23.25V25.5C23.25 25.3625 23.3625 25.25 23.5 25.25C23.6375 25.25 23.75 25.3625 23.75 25.5V26.5H25.25C25.3875 26.5 25.5 26.3875 25.5 26.25V26C25.5 25.9281 25.4688 25.8594 25.4141 25.8125L24.5 25.0109V24.5H26.75V24.625C26.75 24.8328 26.9172 25 27.125 25C27.3328 25 27.5 24.8328 27.5 24.625V24.25V23.75V22.875C27.5 22.6672 27.3328 22.5 27.125 22.5C26.9172 22.5 26.75 22.6672 26.75 22.875V23.1687L24.5 21.8563V20.6531C24.5 20.5172 24.4719 20.3844 24.4187 20.2594L23.7297 18.6516Z" fill="#202831"/>
+<path d="M11.7297 8.65156C11.6906 8.55937 11.6 8.5 11.5 8.5C11.4 8.5 11.3094 8.55937 11.2703 8.65156L10.5813 10.2594C10.5281 10.3844 10.5 10.5172 10.5 10.6531V11.8562L8.25 13.1687V12.875C8.25 12.6672 8.08281 12.5 7.875 12.5C7.66719 12.5 7.5 12.6672 7.5 12.875V13.75V14.25V14.625C7.5 14.8328 7.66719 15 7.875 15C8.08281 15 8.25 14.8328 8.25 14.625V14.5H10.5V15.0109L9.58594 15.8125C9.53125 15.8594 9.5 15.9281 9.5 16V16.25C9.5 16.3875 9.6125 16.5 9.75 16.5H11.25V15.5C11.25 15.3625 11.3625 15.25 11.5 15.25C11.6375 15.25 11.75 15.3625 11.75 15.5V16.5H13.25C13.3875 16.5 13.5 16.3875 13.5 16.25V16C13.5 15.9281 13.4688 15.8594 13.4141 15.8125L12.5 15.0109V14.5H14.75V14.625C14.75 14.8328 14.9172 15 15.125 15C15.3328 15 15.5 14.8328 15.5 14.625V14.25V13.75V12.875C15.5 12.6672 15.3328 12.5 15.125 12.5C14.9172 12.5 14.75 12.6672 14.75 12.875V13.1687L12.5 11.8562V10.6531C12.5 10.5172 12.4719 10.3844 12.4187 10.2594L11.7297 8.65156Z" fill="#202831"/>
+<path d="M17 17L20 19" stroke="#202831" stroke-linecap="round" stroke-dasharray="2 2"/>
 </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
index 42215873..a788953d 100644
--- a/client/public/themes/olympus/images/icons_form_echelon_light.svg
+++ b/client/public/themes/olympus/images/icons_form_echelon_light.svg
@@ -1,4 +1,5 @@
-<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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.7297 18.6516C23.6906 18.5594 23.6 18.5 23.5 18.5C23.4 18.5 23.3094 18.5594 23.2703 18.6516L22.5812 20.2594C22.5281 20.3844 22.5 20.5172 22.5 20.6531V21.8563L20.25 23.1687V22.875C20.25 22.6672 20.0828 22.5 19.875 22.5C19.6672 22.5 19.5 22.6672 19.5 22.875V23.75V24.25V24.625C19.5 24.8328 19.6672 25 19.875 25C20.0828 25 20.25 24.8328 20.25 24.625V24.5H22.5V25.0109L21.5859 25.8125C21.5312 25.8594 21.5 25.9281 21.5 26V26.25C21.5 26.3875 21.6125 26.5 21.75 26.5H23.25V25.5C23.25 25.3625 23.3625 25.25 23.5 25.25C23.6375 25.25 23.75 25.3625 23.75 25.5V26.5H25.25C25.3875 26.5 25.5 26.3875 25.5 26.25V26C25.5 25.9281 25.4688 25.8594 25.4141 25.8125L24.5 25.0109V24.5H26.75V24.625C26.75 24.8328 26.9172 25 27.125 25C27.3328 25 27.5 24.8328 27.5 24.625V24.25V23.75V22.875C27.5 22.6672 27.3328 22.5 27.125 22.5C26.9172 22.5 26.75 22.6672 26.75 22.875V23.1687L24.5 21.8563V20.6531C24.5 20.5172 24.4719 20.3844 24.4187 20.2594L23.7297 18.6516Z" fill="#5CA7FF"/>
+<path d="M11.7297 8.65156C11.6906 8.55937 11.6 8.5 11.5 8.5C11.4 8.5 11.3094 8.55937 11.2703 8.65156L10.5813 10.2594C10.5281 10.3844 10.5 10.5172 10.5 10.6531V11.8562L8.25 13.1687V12.875C8.25 12.6672 8.08281 12.5 7.875 12.5C7.66719 12.5 7.5 12.6672 7.5 12.875V13.75V14.25V14.625C7.5 14.8328 7.66719 15 7.875 15C8.08281 15 8.25 14.8328 8.25 14.625V14.5H10.5V15.0109L9.58594 15.8125C9.53125 15.8594 9.5 15.9281 9.5 16V16.25C9.5 16.3875 9.6125 16.5 9.75 16.5H11.25V15.5C11.25 15.3625 11.3625 15.25 11.5 15.25C11.6375 15.25 11.75 15.3625 11.75 15.5V16.5H13.25C13.3875 16.5 13.5 16.3875 13.5 16.25V16C13.5 15.9281 13.4688 15.8594 13.4141 15.8125L12.5 15.0109V14.5H14.75V14.625C14.75 14.8328 14.9172 15 15.125 15C15.3328 15 15.5 14.8328 15.5 14.625V14.25V13.75V12.875C15.5 12.6672 15.3328 12.5 15.125 12.5C14.9172 12.5 14.75 12.6672 14.75 12.875V13.1687L12.5 11.8562V10.6531C12.5 10.5172 12.4719 10.3844 12.4187 10.2594L11.7297 8.65156Z" fill="#5CA7FF"/>
+<path d="M17 17L20 19" stroke="#5CA7FF" stroke-linecap="round" stroke-dasharray="2 2"/>
 </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
index 0c9ff544..555ea0dd 100644
--- a/client/public/themes/olympus/images/icons_form_trail_dark.svg
+++ b/client/public/themes/olympus/images/icons_form_trail_dark.svg
@@ -1,4 +1,5 @@
-<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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.2297 20.1516C18.1906 20.0594 18.1 20 18 20C17.9 20 17.8094 20.0594 17.7703 20.1516L17.0812 21.7594C17.0281 21.8844 17 22.0172 17 22.1531V23.3563L14.75 24.6687V24.375C14.75 24.1672 14.5828 24 14.375 24C14.1672 24 14 24.1672 14 24.375V25.25V25.75V26.125C14 26.3328 14.1672 26.5 14.375 26.5C14.5828 26.5 14.75 26.3328 14.75 26.125V26H17V26.5109L16.0859 27.3125C16.0312 27.3594 16 27.4281 16 27.5V27.75C16 27.8875 16.1125 28 16.25 28H17.75V27C17.75 26.8625 17.8625 26.75 18 26.75C18.1375 26.75 18.25 26.8625 18.25 27V28H19.75C19.8875 28 20 27.8875 20 27.75V27.5C20 27.4281 19.9688 27.3594 19.9141 27.3125L19 26.5109V26H21.25V26.125C21.25 26.3328 21.4172 26.5 21.625 26.5C21.8328 26.5 22 26.3328 22 26.125V25.75V25.25V24.375C22 24.1672 21.8328 24 21.625 24C21.4172 24 21.25 24.1672 21.25 24.375V24.6687L19 23.3563V22.1531C19 22.0172 18.9719 21.8844 18.9187 21.7594L18.2297 20.1516Z" fill="#202831"/>
+<path d="M18.2297 6.15156C18.1906 6.05937 18.1 6 18 6C17.9 6 17.8094 6.05937 17.7703 6.15156L17.0812 7.75937C17.0281 7.88437 17 8.01719 17 8.15313V9.35625L14.75 10.6687V10.375C14.75 10.1672 14.5828 10 14.375 10C14.1672 10 14 10.1672 14 10.375V11.25V11.75V12.125C14 12.3328 14.1672 12.5 14.375 12.5C14.5828 12.5 14.75 12.3328 14.75 12.125V12H17V12.5109L16.0859 13.3125C16.0312 13.3594 16 13.4281 16 13.5V13.75C16 13.8875 16.1125 14 16.25 14H17.75V13C17.75 12.8625 17.8625 12.75 18 12.75C18.1375 12.75 18.25 12.8625 18.25 13V14H19.75C19.8875 14 20 13.8875 20 13.75V13.5C20 13.4281 19.9688 13.3594 19.9141 13.3125L19 12.5109V12H21.25V12.125C21.25 12.3328 21.4172 12.5 21.625 12.5C21.8328 12.5 22 12.3328 22 12.125V11.75V11.25V10.375C22 10.1672 21.8328 10 21.625 10C21.4172 10 21.25 10.1672 21.25 10.375V10.6687L19 9.35625V8.15313C19 8.01719 18.9719 7.88437 18.9187 7.75937L18.2297 6.15156Z" fill="#202831"/>
+<path d="M18 15.5L18 18.5" stroke="#202831" stroke-linecap="round" stroke-dasharray="2 2"/>
 </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
index bf9fcfd3..0ac432f7 100644
--- a/client/public/themes/olympus/images/icons_form_trail_light.svg
+++ b/client/public/themes/olympus/images/icons_form_trail_light.svg
@@ -1,4 +1,5 @@
-<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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.2297 20.1516C18.1906 20.0594 18.1 20 18 20C17.9 20 17.8094 20.0594 17.7703 20.1516L17.0812 21.7594C17.0281 21.8844 17 22.0172 17 22.1531V23.3563L14.75 24.6687V24.375C14.75 24.1672 14.5828 24 14.375 24C14.1672 24 14 24.1672 14 24.375V25.25V25.75V26.125C14 26.3328 14.1672 26.5 14.375 26.5C14.5828 26.5 14.75 26.3328 14.75 26.125V26H17V26.5109L16.0859 27.3125C16.0312 27.3594 16 27.4281 16 27.5V27.75C16 27.8875 16.1125 28 16.25 28H17.75V27C17.75 26.8625 17.8625 26.75 18 26.75C18.1375 26.75 18.25 26.8625 18.25 27V28H19.75C19.8875 28 20 27.8875 20 27.75V27.5C20 27.4281 19.9688 27.3594 19.9141 27.3125L19 26.5109V26H21.25V26.125C21.25 26.3328 21.4172 26.5 21.625 26.5C21.8328 26.5 22 26.3328 22 26.125V25.75V25.25V24.375C22 24.1672 21.8328 24 21.625 24C21.4172 24 21.25 24.1672 21.25 24.375V24.6687L19 23.3563V22.1531C19 22.0172 18.9719 21.8844 18.9187 21.7594L18.2297 20.1516Z" fill="#5CA7FF"/>
+<path d="M18.2297 6.15156C18.1906 6.05937 18.1 6 18 6C17.9 6 17.8094 6.05937 17.7703 6.15156L17.0812 7.75937C17.0281 7.88437 17 8.01719 17 8.15313V9.35625L14.75 10.6687V10.375C14.75 10.1672 14.5828 10 14.375 10C14.1672 10 14 10.1672 14 10.375V11.25V11.75V12.125C14 12.3328 14.1672 12.5 14.375 12.5C14.5828 12.5 14.75 12.3328 14.75 12.125V12H17V12.5109L16.0859 13.3125C16.0312 13.3594 16 13.4281 16 13.5V13.75C16 13.8875 16.1125 14 16.25 14H17.75V13C17.75 12.8625 17.8625 12.75 18 12.75C18.1375 12.75 18.25 12.8625 18.25 13V14H19.75C19.8875 14 20 13.8875 20 13.75V13.5C20 13.4281 19.9688 13.3594 19.9141 13.3125L19 12.5109V12H21.25V12.125C21.25 12.3328 21.4172 12.5 21.625 12.5C21.8328 12.5 22 12.3328 22 12.125V11.75V11.25V10.375C22 10.1672 21.8328 10 21.625 10C21.4172 10 21.25 10.1672 21.25 10.375V10.6687L19 9.35625V8.15313C19 8.01719 18.9719 7.88437 18.9187 7.75937L18.2297 6.15156Z" fill="#5CA7FF"/>
+<path d="M18 15.5L18 18.5" stroke="#5CA7FF" stroke-linecap="round" stroke-dasharray="2 2"/>
 </svg>
diff --git a/client/public/themes/olympus/images/icons_misc_brush_blue.svg b/client/public/themes/olympus/images/icons_misc_brush_blue.svg
new file mode 100644
index 00000000..7ecf9816
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_brush_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.4199 20.4688C20.1055 20.3672 20.7402 19.9609 21.1211 19.377L25.2344 13.0293C25.5391 12.5215 25.4629 11.8613 25.0312 11.4551C24.5996 11.0488 23.9395 11.0234 23.4824 11.3789L17.4648 15.8984C16.8555 16.3555 16.5 17.0664 16.5 17.8281L19.4199 20.4688ZM18.9121 21.1035L15.9668 18.4629C14.4434 18.5137 13.25 19.7578 13.25 21.2812C13.25 21.3828 13.25 21.4844 13.25 21.5859C13.3008 22.043 12.9961 22.5 12.5391 22.5H12.4375C11.9805 22.5 11.625 22.8809 11.625 23.3125C11.625 23.7695 11.9805 24.125 12.4375 24.125H16.0938C17.6426 24.125 18.9375 22.8555 18.9375 21.2812C18.9375 21.2305 18.9121 21.1543 18.9121 21.1035Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_brush_dark.svg b/client/public/themes/olympus/images/icons_misc_brush_dark.svg
new file mode 100644
index 00000000..ed925a5a
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_brush_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.4199 20.4688C20.1055 20.3672 20.7402 19.9609 21.1211 19.377L25.2344 13.0293C25.5391 12.5215 25.4629 11.8613 25.0312 11.4551C24.5996 11.0488 23.9395 11.0234 23.4824 11.3789L17.4648 15.8984C16.8555 16.3555 16.5 17.0664 16.5 17.8281L19.4199 20.4688ZM18.9121 21.1035L15.9668 18.4629C14.4434 18.5137 13.25 19.7578 13.25 21.2812C13.25 21.3828 13.25 21.4844 13.25 21.5859C13.3008 22.043 12.9961 22.5 12.5391 22.5H12.4375C11.9805 22.5 11.625 22.8809 11.625 23.3125C11.625 23.7695 11.9805 24.125 12.4375 24.125H16.0938C17.6426 24.125 18.9375 22.8555 18.9375 21.2812C18.9375 21.2305 18.9121 21.1543 18.9121 21.1035Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_brush_light.svg b/client/public/themes/olympus/images/icons_misc_brush_light.svg
new file mode 100644
index 00000000..74d2a691
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_brush_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.4199 20.4688C20.1055 20.3672 20.7402 19.9609 21.1211 19.377L25.2344 13.0293C25.5391 12.5215 25.4629 11.8613 25.0312 11.4551C24.5996 11.0488 23.9395 11.0234 23.4824 11.3789L17.4648 15.8984C16.8555 16.3555 16.5 17.0664 16.5 17.8281L19.4199 20.4688ZM18.9121 21.1035L15.9668 18.4629C14.4434 18.5137 13.25 19.7578 13.25 21.2812C13.25 21.3828 13.25 21.4844 13.25 21.5859C13.3008 22.043 12.9961 22.5 12.5391 22.5H12.4375C11.9805 22.5 11.625 22.8809 11.625 23.3125C11.625 23.7695 11.9805 24.125 12.4375 24.125H16.0938C17.6426 24.125 18.9375 22.8555 18.9375 21.2812C18.9375 21.2305 18.9121 21.1543 18.9121 21.1035Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_gas_blue.svg b/client/public/themes/olympus/images/icons_misc_gas_blue.svg
new file mode 100644
index 00000000..13afd5e5
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_gas_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.125 14C13.125 13.3164 13.6719 12.75 14.375 12.75H17.5C18.1836 12.75 18.75 13.3164 18.75 14V17.75H18.9062C19.8438 17.75 20.625 18.5312 20.625 19.4688V20.0938C20.625 20.3672 20.8203 20.5625 21.0938 20.5625C21.3477 20.5625 21.5625 20.3672 21.5625 20.0938V17.0859C21.0156 16.9492 20.625 16.4609 20.625 15.875V14.625L20 14C19.8242 13.8438 19.8242 13.5508 20 13.375C20.1562 13.2188 20.4492 13.2188 20.625 13.375L22.1289 14.8984C22.3633 15.1328 22.5 15.4453 22.5 15.7773V16.0312V16.5V17.125V20.0938C22.5 20.875 21.8555 21.5 21.0938 21.5C20.3125 21.5 19.6875 20.875 19.6875 20.0938V19.4688C19.6875 19.0391 19.3359 18.6875 18.9062 18.6875H18.75V21.5C19.082 21.5 19.375 21.793 19.375 22.125C19.375 22.4766 19.082 22.75 18.75 22.75H13.125C12.7734 22.75 12.5 22.4766 12.5 22.125C12.5 21.793 12.7734 21.5 13.125 21.5V14ZM14.375 14.3125V16.1875C14.375 16.3633 14.5117 16.5 14.6875 16.5H17.1875C17.3438 16.5 17.5 16.3633 17.5 16.1875V14.3125C17.5 14.1562 17.3438 14 17.1875 14H14.6875C14.5117 14 14.375 14.1562 14.375 14.3125Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_gas_dark.svg b/client/public/themes/olympus/images/icons_misc_gas_dark.svg
new file mode 100644
index 00000000..53bb4a3f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_gas_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.125 14C13.125 13.3164 13.6719 12.75 14.375 12.75H17.5C18.1836 12.75 18.75 13.3164 18.75 14V17.75H18.9062C19.8438 17.75 20.625 18.5312 20.625 19.4688V20.0938C20.625 20.3672 20.8203 20.5625 21.0938 20.5625C21.3477 20.5625 21.5625 20.3672 21.5625 20.0938V17.0859C21.0156 16.9492 20.625 16.4609 20.625 15.875V14.625L20 14C19.8242 13.8438 19.8242 13.5508 20 13.375C20.1562 13.2188 20.4492 13.2188 20.625 13.375L22.1289 14.8984C22.3633 15.1328 22.5 15.4453 22.5 15.7773V16.0312V16.5V17.125V20.0938C22.5 20.875 21.8555 21.5 21.0938 21.5C20.3125 21.5 19.6875 20.875 19.6875 20.0938V19.4688C19.6875 19.0391 19.3359 18.6875 18.9062 18.6875H18.75V21.5C19.082 21.5 19.375 21.793 19.375 22.125C19.375 22.4766 19.082 22.75 18.75 22.75H13.125C12.7734 22.75 12.5 22.4766 12.5 22.125C12.5 21.793 12.7734 21.5 13.125 21.5V14ZM14.375 14.3125V16.1875C14.375 16.3633 14.5117 16.5 14.6875 16.5H17.1875C17.3438 16.5 17.5 16.3633 17.5 16.1875V14.3125C17.5 14.1562 17.3438 14 17.1875 14H14.6875C14.5117 14 14.375 14.1562 14.375 14.3125Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_gas_light.svg b/client/public/themes/olympus/images/icons_misc_gas_light.svg
new file mode 100644
index 00000000..8530905f
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_gas_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.125 14C13.125 13.3164 13.6719 12.75 14.375 12.75H17.5C18.1836 12.75 18.75 13.3164 18.75 14V17.75H18.9062C19.8438 17.75 20.625 18.5312 20.625 19.4688V20.0938C20.625 20.3672 20.8203 20.5625 21.0938 20.5625C21.3477 20.5625 21.5625 20.3672 21.5625 20.0938V17.0859C21.0156 16.9492 20.625 16.4609 20.625 15.875V14.625L20 14C19.8242 13.8438 19.8242 13.5508 20 13.375C20.1562 13.2188 20.4492 13.2188 20.625 13.375L22.1289 14.8984C22.3633 15.1328 22.5 15.4453 22.5 15.7773V16.0312V16.5V17.125V20.0938C22.5 20.875 21.8555 21.5 21.0938 21.5C20.3125 21.5 19.6875 20.875 19.6875 20.0938V19.4688C19.6875 19.0391 19.3359 18.6875 18.9062 18.6875H18.75V21.5C19.082 21.5 19.375 21.793 19.375 22.125C19.375 22.4766 19.082 22.75 18.75 22.75H13.125C12.7734 22.75 12.5 22.4766 12.5 22.125C12.5 21.793 12.7734 21.5 13.125 21.5V14ZM14.375 14.3125V16.1875C14.375 16.3633 14.5117 16.5 14.6875 16.5H17.1875C17.3438 16.5 17.5 16.3633 17.5 16.1875V14.3125C17.5 14.1562 17.3438 14 17.1875 14H14.6875C14.5117 14 14.375 14.1562 14.375 14.3125Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_map_blue.svg b/client/public/themes/olympus/images/icons_misc_map_blue.svg
new file mode 100644
index 00000000..3e233196
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_map_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.6562 13.5312C20.6562 15.0352 18.6328 17.6875 17.7578 18.7812C17.5664 19.0547 17.1562 19.0547 16.9648 18.7812C16.0898 17.6875 14.0938 15.0352 14.0938 13.5312C14.0938 11.7266 15.543 10.25 17.375 10.25C19.1797 10.25 20.6562 11.7266 20.6562 13.5312ZM20.875 15.7461C20.957 15.5547 21.0391 15.3633 21.1211 15.1719C21.1484 15.1445 21.1484 15.1172 21.1758 15.0898L24.3477 13.8047C24.7578 13.6406 25.25 13.9414 25.25 14.4062V21.8164C25.25 22.0898 25.0859 22.3359 24.8125 22.4453L20.875 24.0039V15.7461ZM13.2461 14.0508C13.3281 14.4336 13.4375 14.8164 13.6016 15.1719C13.6836 15.3633 13.7656 15.5547 13.875 15.7461V22.6094L10.375 24.0039C9.96484 24.168 9.5 23.8672 9.5 23.4023V15.9922C9.5 15.7188 9.66406 15.4727 9.91016 15.3906L13.2461 14.0508ZM18.4414 19.3281C18.8242 18.8633 19.4258 18.0977 20 17.2227V24.0586L14.75 22.5547V17.2227C15.2969 18.0977 15.8984 18.8633 16.2812 19.3281C16.8281 20.0391 17.8945 20.0391 18.4414 19.3281ZM17.375 14.4062C17.9766 14.4062 18.4688 13.9414 18.4688 13.3125C18.4688 12.7109 17.9766 12.2188 17.375 12.2188C16.7461 12.2188 16.2812 12.7109 16.2812 13.3125C16.2812 13.9414 16.7461 14.4062 17.375 14.4062Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_map_dark.svg b/client/public/themes/olympus/images/icons_misc_map_dark.svg
new file mode 100644
index 00000000..6b9a5219
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_map_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.6562 13.5312C20.6562 15.0352 18.6328 17.6875 17.7578 18.7812C17.5664 19.0547 17.1562 19.0547 16.9648 18.7812C16.0898 17.6875 14.0938 15.0352 14.0938 13.5312C14.0938 11.7266 15.543 10.25 17.375 10.25C19.1797 10.25 20.6562 11.7266 20.6562 13.5312ZM20.875 15.7461C20.957 15.5547 21.0391 15.3633 21.1211 15.1719C21.1484 15.1445 21.1484 15.1172 21.1758 15.0898L24.3477 13.8047C24.7578 13.6406 25.25 13.9414 25.25 14.4062V21.8164C25.25 22.0898 25.0859 22.3359 24.8125 22.4453L20.875 24.0039V15.7461ZM13.2461 14.0508C13.3281 14.4336 13.4375 14.8164 13.6016 15.1719C13.6836 15.3633 13.7656 15.5547 13.875 15.7461V22.6094L10.375 24.0039C9.96484 24.168 9.5 23.8672 9.5 23.4023V15.9922C9.5 15.7188 9.66406 15.4727 9.91016 15.3906L13.2461 14.0508ZM18.4414 19.3281C18.8242 18.8633 19.4258 18.0977 20 17.2227V24.0586L14.75 22.5547V17.2227C15.2969 18.0977 15.8984 18.8633 16.2812 19.3281C16.8281 20.0391 17.8945 20.0391 18.4414 19.3281ZM17.375 14.4062C17.9766 14.4062 18.4688 13.9414 18.4688 13.3125C18.4688 12.7109 17.9766 12.2188 17.375 12.2188C16.7461 12.2188 16.2812 12.7109 16.2812 13.3125C16.2812 13.9414 16.7461 14.4062 17.375 14.4062Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_map_light.svg b/client/public/themes/olympus/images/icons_misc_map_light.svg
new file mode 100644
index 00000000..8bec4777
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_map_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.6562 13.5312C20.6562 15.0352 18.6328 17.6875 17.7578 18.7812C17.5664 19.0547 17.1562 19.0547 16.9648 18.7812C16.0898 17.6875 14.0938 15.0352 14.0938 13.5312C14.0938 11.7266 15.543 10.25 17.375 10.25C19.1797 10.25 20.6562 11.7266 20.6562 13.5312ZM20.875 15.7461C20.957 15.5547 21.0391 15.3633 21.1211 15.1719C21.1484 15.1445 21.1484 15.1172 21.1758 15.0898L24.3477 13.8047C24.7578 13.6406 25.25 13.9414 25.25 14.4062V21.8164C25.25 22.0898 25.0859 22.3359 24.8125 22.4453L20.875 24.0039V15.7461ZM13.2461 14.0508C13.3281 14.4336 13.4375 14.8164 13.6016 15.1719C13.6836 15.3633 13.7656 15.5547 13.875 15.7461V22.6094L10.375 24.0039C9.96484 24.168 9.5 23.8672 9.5 23.4023V15.9922C9.5 15.7188 9.66406 15.4727 9.91016 15.3906L13.2461 14.0508ZM18.4414 19.3281C18.8242 18.8633 19.4258 18.0977 20 17.2227V24.0586L14.75 22.5547V17.2227C15.2969 18.0977 15.8984 18.8633 16.2812 19.3281C16.8281 20.0391 17.8945 20.0391 18.4414 19.3281ZM17.375 14.4062C17.9766 14.4062 18.4688 13.9414 18.4688 13.3125C18.4688 12.7109 17.9766 12.2188 17.375 12.2188C16.7461 12.2188 16.2812 12.7109 16.2812 13.3125C16.2812 13.9414 16.7461 14.4062 17.375 14.4062Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_plane_blue.svg b/client/public/themes/olympus/images/icons_misc_plane_blue.svg
new file mode 100644
index 00000000..7bf3bcd8
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_plane_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.1211 16C24.1172 16 25.875 16.8496 25.875 17.875C25.875 18.9297 24.1172 19.75 23.1211 19.75H19.6934L16.7637 24.9062C16.5879 25.1992 16.2656 25.375 15.9434 25.375H14.3027C13.9805 25.375 13.7461 25.082 13.834 24.7891L15.2695 19.75H12.2812L10.9922 21.4492C10.9043 21.5664 10.7871 21.625 10.6406 21.625H9.41016C9.17578 21.625 9 21.4492 9 21.2148C9 21.1855 9 21.1562 9 21.127L9.9375 17.875L9 14.6523C9 14.623 9 14.5938 9 14.5352C9 14.3301 9.17578 14.125 9.41016 14.125H10.6406C10.7871 14.125 10.9043 14.2129 10.9922 14.3301L12.2812 16H15.2695L13.834 10.9902C13.7461 10.6973 13.9805 10.375 14.3027 10.375H15.9434C16.2656 10.375 16.5879 10.5801 16.7637 10.873L19.6934 16H23.1211Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_plane_dark.svg b/client/public/themes/olympus/images/icons_misc_plane_dark.svg
new file mode 100644
index 00000000..cec512c5
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_plane_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.1211 16C24.1172 16 25.875 16.8496 25.875 17.875C25.875 18.9297 24.1172 19.75 23.1211 19.75H19.6934L16.7637 24.9062C16.5879 25.1992 16.2656 25.375 15.9434 25.375H14.3027C13.9805 25.375 13.7461 25.082 13.834 24.7891L15.2695 19.75H12.2812L10.9922 21.4492C10.9043 21.5664 10.7871 21.625 10.6406 21.625H9.41016C9.17578 21.625 9 21.4492 9 21.2148C9 21.1855 9 21.1562 9 21.127L9.9375 17.875L9 14.6523C9 14.623 9 14.5938 9 14.5352C9 14.3301 9.17578 14.125 9.41016 14.125H10.6406C10.7871 14.125 10.9043 14.2129 10.9922 14.3301L12.2812 16H15.2695L13.834 10.9902C13.7461 10.6973 13.9805 10.375 14.3027 10.375H15.9434C16.2656 10.375 16.5879 10.5801 16.7637 10.873L19.6934 16H23.1211Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_plane_light.svg b/client/public/themes/olympus/images/icons_misc_plane_light.svg
new file mode 100644
index 00000000..cf34b9c8
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_plane_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.1211 16C24.1172 16 25.875 16.8496 25.875 17.875C25.875 18.9297 24.1172 19.75 23.1211 19.75H19.6934L16.7637 24.9062C16.5879 25.1992 16.2656 25.375 15.9434 25.375H14.3027C13.9805 25.375 13.7461 25.082 13.834 24.7891L15.2695 19.75H12.2812L10.9922 21.4492C10.9043 21.5664 10.7871 21.625 10.6406 21.625H9.41016C9.17578 21.625 9 21.4492 9 21.2148C9 21.1855 9 21.1562 9 21.127L9.9375 17.875L9 14.6523C9 14.623 9 14.5938 9 14.5352C9 14.3301 9.17578 14.125 9.41016 14.125H10.6406C10.7871 14.125 10.9043 14.2129 10.9922 14.3301L12.2812 16H15.2695L13.834 10.9902C13.7461 10.6973 13.9805 10.375 14.3027 10.375H15.9434C16.2656 10.375 16.5879 10.5801 16.7637 10.873L19.6934 16H23.1211Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_settings_blue.svg b/client/public/themes/olympus/images/icons_misc_settings_blue.svg
new file mode 100644
index 00000000..2d7004c6
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_settings_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.0234 14.3594C17.2285 14.1543 17.3164 13.8906 17.1992 13.627C17.1406 13.4512 17.0527 13.3047 16.9941 13.1582L16.9062 13.0117C16.8184 12.8652 16.7012 12.7188 16.6133 12.5723C16.4375 12.3672 16.1445 12.2793 15.8809 12.3672L15.0605 12.6309C14.7383 12.3965 14.3867 12.1621 14.0059 12.0449L13.8301 11.1953C13.7715 10.9023 13.5371 10.6973 13.2734 10.668C13.0684 10.6387 12.8633 10.6094 12.6875 10.6094C12.4824 10.6094 12.2773 10.6387 12.0723 10.668C11.8086 10.6973 11.6035 10.9023 11.5449 11.166L11.3691 12.0449C10.959 12.1914 10.6074 12.3965 10.2852 12.6309L9.46484 12.3672C9.20117 12.2793 8.9082 12.3672 8.73242 12.5723C8.64453 12.7188 8.55664 12.8652 8.43945 13.0117L8.35156 13.1582C8.29297 13.3047 8.20508 13.4512 8.14648 13.627C8.0293 13.8906 8.11719 14.1543 8.32227 14.3594L8.9668 14.9453C8.9375 15.1211 8.9375 15.3262 8.9375 15.5312C8.9375 15.7656 8.9375 15.9707 8.9668 16.1465L8.32227 16.7324C8.11719 16.9082 8.0293 17.2012 8.14648 17.4648C8.20508 17.6113 8.29297 17.7871 8.35156 17.9336L8.43945 18.0801C8.52734 18.2266 8.64453 18.373 8.73242 18.5195C8.9082 18.7246 9.20117 18.8125 9.46484 18.7246L10.2852 18.4316C10.6074 18.6953 10.959 18.9004 11.3398 19.0469L11.5449 19.8965C11.5742 20.1895 11.8086 20.3945 12.0723 20.4238C12.2773 20.4531 12.4824 20.4531 12.6582 20.4531C12.8633 20.4531 13.0684 20.4531 13.2734 20.4238C13.5371 20.3945 13.7422 20.1895 13.8008 19.8965L13.9766 19.0469C14.3867 18.9004 14.7383 18.6953 15.0605 18.4316L15.8809 18.7246C16.1445 18.8125 16.4375 18.7246 16.6133 18.5195C16.7012 18.373 16.7891 18.2266 16.877 18.0801L16.9648 17.9336C17.0527 17.7871 17.1406 17.6113 17.1992 17.4648C17.3164 17.2012 17.2285 16.9082 17.0234 16.7324L16.3789 16.1465C16.4082 15.9414 16.4082 15.7363 16.4082 15.5312C16.4082 15.3262 16.4082 15.1211 16.3789 14.916L17.0234 14.3594ZM14.0938 15.5312C14.0938 16.3223 13.4492 16.9375 12.6875 16.9375C11.8965 16.9375 11.2812 16.3223 11.2812 15.5312C11.2812 14.7695 11.8965 14.125 12.6875 14.125C13.4492 14.125 14.0938 14.7695 14.0938 15.5312ZM22.7656 25.0527C22.9707 25.2578 23.2344 25.3457 23.498 25.2285C23.6738 25.1699 23.8203 25.082 23.9668 25.0234L24.1133 24.9062C24.2598 24.8184 24.4062 24.7305 24.5527 24.6426C24.7578 24.4668 24.8457 24.1738 24.7578 23.9102L24.4941 23.0898C24.7285 22.7676 24.9629 22.416 25.0801 22.0352L25.959 21.8301C26.2227 21.8008 26.4277 21.5664 26.457 21.3027C26.4863 21.0977 26.5156 20.8926 26.5156 20.7168C26.5156 20.5117 26.4863 20.3066 26.457 20.1016C26.4277 19.8379 26.2227 19.6328 25.959 19.5742L25.0801 19.3691C24.9336 18.9883 24.7285 18.6367 24.4941 18.3145L24.7578 17.4941C24.8457 17.2305 24.7578 16.9375 24.5527 16.7617C24.4062 16.6738 24.2598 16.5859 24.1133 16.4688L23.9668 16.3809C23.8203 16.3223 23.6738 16.2344 23.498 16.1758C23.2637 16.0586 22.9707 16.1465 22.7656 16.3516L22.1797 16.9961C22.0039 16.9668 21.7988 16.9668 21.5938 16.9668C21.3594 16.9668 21.1543 16.9668 20.9785 16.9961L20.3926 16.3516C20.2168 16.1465 19.9238 16.0586 19.6602 16.1758C19.5137 16.2344 19.3379 16.3223 19.1914 16.3809L19.0449 16.4688C18.8984 16.5566 18.752 16.6738 18.6055 16.7617C18.4004 16.9375 18.3125 17.2305 18.4004 17.4941L18.6934 18.3145C18.4297 18.6367 18.2246 18.9883 18.0781 19.3691L17.2285 19.5449C16.9355 19.6035 16.7305 19.8379 16.7012 20.1016C16.6719 20.3066 16.6719 20.4824 16.6719 20.6875C16.6719 20.8926 16.6719 21.0977 16.7012 21.3027C16.7305 21.5664 16.9355 21.7715 17.2285 21.8301L18.0781 22.0059C18.2246 22.416 18.4297 22.7676 18.6934 23.0898L18.4004 23.9102C18.3125 24.1738 18.4004 24.4668 18.6055 24.6133C18.752 24.7305 18.8984 24.8184 19.0449 24.9062L19.1914 24.9941C19.3379 25.082 19.5137 25.1699 19.6602 25.2285C19.9238 25.3457 20.2168 25.2578 20.3926 25.0527L20.9785 24.4082C21.1836 24.4375 21.3887 24.4375 21.5938 24.4375C21.7988 24.4375 22.0039 24.4375 22.209 24.4082L22.7656 25.0527ZM21.5938 22.0938C20.8027 22.0938 20.1875 21.4785 20.1875 20.6875C20.1875 19.9258 20.8027 19.2812 21.5938 19.2812C22.3555 19.2812 23 19.9258 23 20.6875C23 21.4785 22.3555 22.0938 21.5938 22.0938Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_settings_dark.svg b/client/public/themes/olympus/images/icons_misc_settings_dark.svg
new file mode 100644
index 00000000..04b375e4
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_settings_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.0234 14.3594C17.2285 14.1543 17.3164 13.8906 17.1992 13.627C17.1406 13.4512 17.0527 13.3047 16.9941 13.1582L16.9062 13.0117C16.8184 12.8652 16.7012 12.7188 16.6133 12.5723C16.4375 12.3672 16.1445 12.2793 15.8809 12.3672L15.0605 12.6309C14.7383 12.3965 14.3867 12.1621 14.0059 12.0449L13.8301 11.1953C13.7715 10.9023 13.5371 10.6973 13.2734 10.668C13.0684 10.6387 12.8633 10.6094 12.6875 10.6094C12.4824 10.6094 12.2773 10.6387 12.0723 10.668C11.8086 10.6973 11.6035 10.9023 11.5449 11.166L11.3691 12.0449C10.959 12.1914 10.6074 12.3965 10.2852 12.6309L9.46484 12.3672C9.20117 12.2793 8.9082 12.3672 8.73242 12.5723C8.64453 12.7188 8.55664 12.8652 8.43945 13.0117L8.35156 13.1582C8.29297 13.3047 8.20508 13.4512 8.14648 13.627C8.0293 13.8906 8.11719 14.1543 8.32227 14.3594L8.9668 14.9453C8.9375 15.1211 8.9375 15.3262 8.9375 15.5312C8.9375 15.7656 8.9375 15.9707 8.9668 16.1465L8.32227 16.7324C8.11719 16.9082 8.0293 17.2012 8.14648 17.4648C8.20508 17.6113 8.29297 17.7871 8.35156 17.9336L8.43945 18.0801C8.52734 18.2266 8.64453 18.373 8.73242 18.5195C8.9082 18.7246 9.20117 18.8125 9.46484 18.7246L10.2852 18.4316C10.6074 18.6953 10.959 18.9004 11.3398 19.0469L11.5449 19.8965C11.5742 20.1895 11.8086 20.3945 12.0723 20.4238C12.2773 20.4531 12.4824 20.4531 12.6582 20.4531C12.8633 20.4531 13.0684 20.4531 13.2734 20.4238C13.5371 20.3945 13.7422 20.1895 13.8008 19.8965L13.9766 19.0469C14.3867 18.9004 14.7383 18.6953 15.0605 18.4316L15.8809 18.7246C16.1445 18.8125 16.4375 18.7246 16.6133 18.5195C16.7012 18.373 16.7891 18.2266 16.877 18.0801L16.9648 17.9336C17.0527 17.7871 17.1406 17.6113 17.1992 17.4648C17.3164 17.2012 17.2285 16.9082 17.0234 16.7324L16.3789 16.1465C16.4082 15.9414 16.4082 15.7363 16.4082 15.5312C16.4082 15.3262 16.4082 15.1211 16.3789 14.916L17.0234 14.3594ZM14.0938 15.5312C14.0938 16.3223 13.4492 16.9375 12.6875 16.9375C11.8965 16.9375 11.2812 16.3223 11.2812 15.5312C11.2812 14.7695 11.8965 14.125 12.6875 14.125C13.4492 14.125 14.0938 14.7695 14.0938 15.5312ZM22.7656 25.0527C22.9707 25.2578 23.2344 25.3457 23.498 25.2285C23.6738 25.1699 23.8203 25.082 23.9668 25.0234L24.1133 24.9062C24.2598 24.8184 24.4062 24.7305 24.5527 24.6426C24.7578 24.4668 24.8457 24.1738 24.7578 23.9102L24.4941 23.0898C24.7285 22.7676 24.9629 22.416 25.0801 22.0352L25.959 21.8301C26.2227 21.8008 26.4277 21.5664 26.457 21.3027C26.4863 21.0977 26.5156 20.8926 26.5156 20.7168C26.5156 20.5117 26.4863 20.3066 26.457 20.1016C26.4277 19.8379 26.2227 19.6328 25.959 19.5742L25.0801 19.3691C24.9336 18.9883 24.7285 18.6367 24.4941 18.3145L24.7578 17.4941C24.8457 17.2305 24.7578 16.9375 24.5527 16.7617C24.4062 16.6738 24.2598 16.5859 24.1133 16.4688L23.9668 16.3809C23.8203 16.3223 23.6738 16.2344 23.498 16.1758C23.2637 16.0586 22.9707 16.1465 22.7656 16.3516L22.1797 16.9961C22.0039 16.9668 21.7988 16.9668 21.5938 16.9668C21.3594 16.9668 21.1543 16.9668 20.9785 16.9961L20.3926 16.3516C20.2168 16.1465 19.9238 16.0586 19.6602 16.1758C19.5137 16.2344 19.3379 16.3223 19.1914 16.3809L19.0449 16.4688C18.8984 16.5566 18.752 16.6738 18.6055 16.7617C18.4004 16.9375 18.3125 17.2305 18.4004 17.4941L18.6934 18.3145C18.4297 18.6367 18.2246 18.9883 18.0781 19.3691L17.2285 19.5449C16.9355 19.6035 16.7305 19.8379 16.7012 20.1016C16.6719 20.3066 16.6719 20.4824 16.6719 20.6875C16.6719 20.8926 16.6719 21.0977 16.7012 21.3027C16.7305 21.5664 16.9355 21.7715 17.2285 21.8301L18.0781 22.0059C18.2246 22.416 18.4297 22.7676 18.6934 23.0898L18.4004 23.9102C18.3125 24.1738 18.4004 24.4668 18.6055 24.6133C18.752 24.7305 18.8984 24.8184 19.0449 24.9062L19.1914 24.9941C19.3379 25.082 19.5137 25.1699 19.6602 25.2285C19.9238 25.3457 20.2168 25.2578 20.3926 25.0527L20.9785 24.4082C21.1836 24.4375 21.3887 24.4375 21.5938 24.4375C21.7988 24.4375 22.0039 24.4375 22.209 24.4082L22.7656 25.0527ZM21.5938 22.0938C20.8027 22.0938 20.1875 21.4785 20.1875 20.6875C20.1875 19.9258 20.8027 19.2812 21.5938 19.2812C22.3555 19.2812 23 19.9258 23 20.6875C23 21.4785 22.3555 22.0938 21.5938 22.0938Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_settings_light.svg b/client/public/themes/olympus/images/icons_misc_settings_light.svg
new file mode 100644
index 00000000..19270b5c
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_settings_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.0234 14.3594C17.2285 14.1543 17.3164 13.8906 17.1992 13.627C17.1406 13.4512 17.0527 13.3047 16.9941 13.1582L16.9062 13.0117C16.8184 12.8652 16.7012 12.7188 16.6133 12.5723C16.4375 12.3672 16.1445 12.2793 15.8809 12.3672L15.0605 12.6309C14.7383 12.3965 14.3867 12.1621 14.0059 12.0449L13.8301 11.1953C13.7715 10.9023 13.5371 10.6973 13.2734 10.668C13.0684 10.6387 12.8633 10.6094 12.6875 10.6094C12.4824 10.6094 12.2773 10.6387 12.0723 10.668C11.8086 10.6973 11.6035 10.9023 11.5449 11.166L11.3691 12.0449C10.959 12.1914 10.6074 12.3965 10.2852 12.6309L9.46484 12.3672C9.20117 12.2793 8.9082 12.3672 8.73242 12.5723C8.64453 12.7188 8.55664 12.8652 8.43945 13.0117L8.35156 13.1582C8.29297 13.3047 8.20508 13.4512 8.14648 13.627C8.0293 13.8906 8.11719 14.1543 8.32227 14.3594L8.9668 14.9453C8.9375 15.1211 8.9375 15.3262 8.9375 15.5312C8.9375 15.7656 8.9375 15.9707 8.9668 16.1465L8.32227 16.7324C8.11719 16.9082 8.0293 17.2012 8.14648 17.4648C8.20508 17.6113 8.29297 17.7871 8.35156 17.9336L8.43945 18.0801C8.52734 18.2266 8.64453 18.373 8.73242 18.5195C8.9082 18.7246 9.20117 18.8125 9.46484 18.7246L10.2852 18.4316C10.6074 18.6953 10.959 18.9004 11.3398 19.0469L11.5449 19.8965C11.5742 20.1895 11.8086 20.3945 12.0723 20.4238C12.2773 20.4531 12.4824 20.4531 12.6582 20.4531C12.8633 20.4531 13.0684 20.4531 13.2734 20.4238C13.5371 20.3945 13.7422 20.1895 13.8008 19.8965L13.9766 19.0469C14.3867 18.9004 14.7383 18.6953 15.0605 18.4316L15.8809 18.7246C16.1445 18.8125 16.4375 18.7246 16.6133 18.5195C16.7012 18.373 16.7891 18.2266 16.877 18.0801L16.9648 17.9336C17.0527 17.7871 17.1406 17.6113 17.1992 17.4648C17.3164 17.2012 17.2285 16.9082 17.0234 16.7324L16.3789 16.1465C16.4082 15.9414 16.4082 15.7363 16.4082 15.5312C16.4082 15.3262 16.4082 15.1211 16.3789 14.916L17.0234 14.3594ZM14.0938 15.5312C14.0938 16.3223 13.4492 16.9375 12.6875 16.9375C11.8965 16.9375 11.2812 16.3223 11.2812 15.5312C11.2812 14.7695 11.8965 14.125 12.6875 14.125C13.4492 14.125 14.0938 14.7695 14.0938 15.5312ZM22.7656 25.0527C22.9707 25.2578 23.2344 25.3457 23.498 25.2285C23.6738 25.1699 23.8203 25.082 23.9668 25.0234L24.1133 24.9062C24.2598 24.8184 24.4062 24.7305 24.5527 24.6426C24.7578 24.4668 24.8457 24.1738 24.7578 23.9102L24.4941 23.0898C24.7285 22.7676 24.9629 22.416 25.0801 22.0352L25.959 21.8301C26.2227 21.8008 26.4277 21.5664 26.457 21.3027C26.4863 21.0977 26.5156 20.8926 26.5156 20.7168C26.5156 20.5117 26.4863 20.3066 26.457 20.1016C26.4277 19.8379 26.2227 19.6328 25.959 19.5742L25.0801 19.3691C24.9336 18.9883 24.7285 18.6367 24.4941 18.3145L24.7578 17.4941C24.8457 17.2305 24.7578 16.9375 24.5527 16.7617C24.4062 16.6738 24.2598 16.5859 24.1133 16.4688L23.9668 16.3809C23.8203 16.3223 23.6738 16.2344 23.498 16.1758C23.2637 16.0586 22.9707 16.1465 22.7656 16.3516L22.1797 16.9961C22.0039 16.9668 21.7988 16.9668 21.5938 16.9668C21.3594 16.9668 21.1543 16.9668 20.9785 16.9961L20.3926 16.3516C20.2168 16.1465 19.9238 16.0586 19.6602 16.1758C19.5137 16.2344 19.3379 16.3223 19.1914 16.3809L19.0449 16.4688C18.8984 16.5566 18.752 16.6738 18.6055 16.7617C18.4004 16.9375 18.3125 17.2305 18.4004 17.4941L18.6934 18.3145C18.4297 18.6367 18.2246 18.9883 18.0781 19.3691L17.2285 19.5449C16.9355 19.6035 16.7305 19.8379 16.7012 20.1016C16.6719 20.3066 16.6719 20.4824 16.6719 20.6875C16.6719 20.8926 16.6719 21.0977 16.7012 21.3027C16.7305 21.5664 16.9355 21.7715 17.2285 21.8301L18.0781 22.0059C18.2246 22.416 18.4297 22.7676 18.6934 23.0898L18.4004 23.9102C18.3125 24.1738 18.4004 24.4668 18.6055 24.6133C18.752 24.7305 18.8984 24.8184 19.0449 24.9062L19.1914 24.9941C19.3379 25.082 19.5137 25.1699 19.6602 25.2285C19.9238 25.3457 20.2168 25.2578 20.3926 25.0527L20.9785 24.4082C21.1836 24.4375 21.3887 24.4375 21.5938 24.4375C21.7988 24.4375 22.0039 24.4375 22.209 24.4082L22.7656 25.0527ZM21.5938 22.0938C20.8027 22.0938 20.1875 21.4785 20.1875 20.6875C20.1875 19.9258 20.8027 19.2812 21.5938 19.2812C22.3555 19.2812 23 19.9258 23 20.6875C23 21.4785 22.3555 22.0938 21.5938 22.0938Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_visible_blue.svg b/client/public/themes/olympus/images/icons_misc_visible_blue.svg
new file mode 100644
index 00000000..66f1ae9a
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_visible_blue.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.3125 11.4375C15.2559 11.4375 13.6055 12.377 12.4121 13.4941C11.2188 14.5859 10.4316 15.9062 10.0508 16.8203C9.97461 17.0234 9.97461 17.252 10.0508 17.4551C10.4316 18.3438 11.2188 19.6641 12.4121 20.7812C13.6055 21.8984 15.2559 22.8125 17.3125 22.8125C19.3438 22.8125 20.9941 21.8984 22.1875 20.7812C23.3809 19.6641 24.168 18.3438 24.5488 17.4551C24.625 17.252 24.625 17.0234 24.5488 16.8203C24.168 15.9062 23.3809 14.5859 22.1875 13.4941C20.9941 12.377 19.3438 11.4375 17.3125 11.4375ZM20.9688 17.125C20.9688 19.1562 19.3184 20.7812 17.3125 20.7812C15.2812 20.7812 13.6562 19.1562 13.6562 17.125C13.6562 15.1191 15.2812 13.4688 17.3125 13.4688C19.3184 13.4688 20.9688 15.1191 20.9688 17.125ZM17.3125 15.5C17.3125 16.4141 16.5762 17.125 15.6875 17.125C15.3828 17.125 15.1035 17.0488 14.875 16.9219C14.875 16.998 14.875 17.0742 14.875 17.125C14.875 18.4707 15.9668 19.5625 17.3125 19.5625C18.6582 19.5625 19.75 18.4707 19.75 17.125C19.75 15.7793 18.6582 14.6875 17.3125 14.6875C17.2363 14.6875 17.1602 14.7129 17.084 14.7129C17.2109 14.9414 17.3125 15.2207 17.3125 15.5Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_visible_dark.svg b/client/public/themes/olympus/images/icons_misc_visible_dark.svg
new file mode 100644
index 00000000..0023c2c1
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_visible_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.3125 11.4375C15.2559 11.4375 13.6055 12.377 12.4121 13.4941C11.2188 14.5859 10.4316 15.9062 10.0508 16.8203C9.97461 17.0234 9.97461 17.252 10.0508 17.4551C10.4316 18.3438 11.2188 19.6641 12.4121 20.7812C13.6055 21.8984 15.2559 22.8125 17.3125 22.8125C19.3438 22.8125 20.9941 21.8984 22.1875 20.7812C23.3809 19.6641 24.168 18.3438 24.5488 17.4551C24.625 17.252 24.625 17.0234 24.5488 16.8203C24.168 15.9062 23.3809 14.5859 22.1875 13.4941C20.9941 12.377 19.3438 11.4375 17.3125 11.4375ZM20.9688 17.125C20.9688 19.1562 19.3184 20.7812 17.3125 20.7812C15.2812 20.7812 13.6562 19.1562 13.6562 17.125C13.6562 15.1191 15.2812 13.4688 17.3125 13.4688C19.3184 13.4688 20.9688 15.1191 20.9688 17.125ZM17.3125 15.5C17.3125 16.4141 16.5762 17.125 15.6875 17.125C15.3828 17.125 15.1035 17.0488 14.875 16.9219C14.875 16.998 14.875 17.0742 14.875 17.125C14.875 18.4707 15.9668 19.5625 17.3125 19.5625C18.6582 19.5625 19.75 18.4707 19.75 17.125C19.75 15.7793 18.6582 14.6875 17.3125 14.6875C17.2363 14.6875 17.1602 14.7129 17.084 14.7129C17.2109 14.9414 17.3125 15.2207 17.3125 15.5Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_misc_visible_light.svg b/client/public/themes/olympus/images/icons_misc_visible_light.svg
new file mode 100644
index 00000000..46f1b080
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_misc_visible_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.3125 11.4375C15.2559 11.4375 13.6055 12.377 12.4121 13.4941C11.2188 14.5859 10.4316 15.9062 10.0508 16.8203C9.97461 17.0234 9.97461 17.252 10.0508 17.4551C10.4316 18.3438 11.2188 19.6641 12.4121 20.7812C13.6055 21.8984 15.2559 22.8125 17.3125 22.8125C19.3438 22.8125 20.9941 21.8984 22.1875 20.7812C23.3809 19.6641 24.168 18.3438 24.5488 17.4551C24.625 17.252 24.625 17.0234 24.5488 16.8203C24.168 15.9062 23.3809 14.5859 22.1875 13.4941C20.9941 12.377 19.3438 11.4375 17.3125 11.4375ZM20.9688 17.125C20.9688 19.1562 19.3184 20.7812 17.3125 20.7812C15.2812 20.7812 13.6562 19.1562 13.6562 17.125C13.6562 15.1191 15.2812 13.4688 17.3125 13.4688C19.3184 13.4688 20.9688 15.1191 20.9688 17.125ZM17.3125 15.5C17.3125 16.4141 16.5762 17.125 15.6875 17.125C15.3828 17.125 15.1035 17.0488 14.875 16.9219C14.875 16.998 14.875 17.0742 14.875 17.125C14.875 18.4707 15.9668 19.5625 17.3125 19.5625C18.6582 19.5625 19.75 18.4707 19.75 17.125C19.75 15.7793 18.6582 14.6875 17.3125 14.6875C17.2363 14.6875 17.1602 14.7129 17.084 14.7129C17.2109 14.9414 17.3125 15.2207 17.3125 15.5Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_attack_dark.svg b/client/public/themes/olympus/images/icons_roe_attack_dark.svg
new file mode 100644
index 00000000..db976cbb
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_attack_dark.svg
@@ -0,0 +1,10 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_536_3452)">
+<path d="M18.2465 21.8155C18.2868 21.4033 17.9852 21.0364 17.5729 20.9962C17.4743 20.9866 17.3683 20.9621 17.257 20.9252L22.8034 15.3787C22.8858 15.2964 22.9478 15.196 22.9846 15.0856L24.0453 11.9036C24.2407 11.3173 23.6829 10.7595 23.0966 10.9549L19.9146 12.0156C19.8042 12.0524 19.7038 12.1144 19.6215 12.1968L14.0656 17.7526C14.0323 17.6468 14.0117 17.5467 14.006 17.4545C13.9809 17.041 13.6253 16.7263 13.2119 16.7514C12.7984 16.7766 12.4837 17.1321 12.5088 17.5456C12.5429 18.1052 12.8217 18.753 13.2473 19.3918C13.2522 19.3997 13.2566 19.4078 13.2619 19.4156C13.3201 19.5018 13.3817 19.5879 13.445 19.6736C13.4497 19.68 13.4542 19.6863 13.4589 19.6926C13.4791 19.7198 13.4995 19.7469 13.5202 19.774C13.5383 19.7979 13.5568 19.8217 13.5753 19.8454C13.5987 19.8754 13.6223 19.9054 13.6463 19.9353C13.6679 19.9623 13.6897 19.9892 13.7118 20.016C13.7274 20.035 13.7429 20.0539 13.7587 20.0728C13.7751 20.0923 13.7917 20.1118 13.8082 20.1312L11.6664 22.273C11.3735 21.9802 10.8987 21.9802 10.6058 22.273C10.3129 22.5659 10.3129 23.0407 10.6058 23.3336L11.6665 24.3943C11.9594 24.6872 12.4342 24.6872 12.7271 24.3943C13.02 24.1014 13.02 23.6266 12.7271 23.3337L14.8721 21.1887C15.7157 21.8987 16.6489 22.4131 17.4272 22.4891C17.8395 22.5293 18.2063 22.2278 18.2465 21.8155ZM14.8728 19.0668L20.5569 13.3826L22.1479 12.8523L21.6176 14.4433L15.9381 20.1228C15.7916 20.0043 15.6474 19.878 15.5079 19.746C15.4986 19.7373 15.4895 19.7284 15.4803 19.7196C15.4451 19.6861 15.4103 19.6521 15.3758 19.6179C15.3639 19.6061 15.3521 19.5942 15.3402 19.5823C15.1733 19.4142 15.0169 19.2419 14.8728 19.0668Z" fill="#202831"/>
+</g>
+<defs>
+<clipPath id="clip0_536_3452">
+<rect width="10" height="18" fill="white" transform="translate(20.3286 7.60059) rotate(45)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_attack_light.svg b/client/public/themes/olympus/images/icons_roe_attack_light.svg
new file mode 100644
index 00000000..06ff8bb3
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_attack_light.svg
@@ -0,0 +1,10 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_536_3453)">
+<path d="M18.2465 21.8155C18.2868 21.4033 17.9852 21.0364 17.5729 20.9962C17.4743 20.9866 17.3683 20.9621 17.257 20.9252L22.8034 15.3787C22.8858 15.2964 22.9478 15.196 22.9846 15.0856L24.0453 11.9036C24.2407 11.3173 23.6829 10.7595 23.0966 10.9549L19.9146 12.0156C19.8042 12.0524 19.7038 12.1144 19.6215 12.1968L14.0656 17.7526C14.0323 17.6468 14.0117 17.5467 14.006 17.4545C13.9809 17.041 13.6253 16.7263 13.2119 16.7514C12.7984 16.7766 12.4837 17.1321 12.5088 17.5456C12.5429 18.1052 12.8217 18.753 13.2473 19.3918C13.2522 19.3997 13.2566 19.4078 13.2619 19.4156C13.3201 19.5018 13.3817 19.5879 13.445 19.6736C13.4497 19.68 13.4542 19.6863 13.4589 19.6926C13.4791 19.7198 13.4995 19.7469 13.5202 19.774C13.5383 19.7979 13.5568 19.8217 13.5753 19.8454C13.5987 19.8754 13.6223 19.9054 13.6463 19.9353C13.6679 19.9623 13.6897 19.9892 13.7118 20.016C13.7274 20.035 13.7429 20.0539 13.7587 20.0728C13.7751 20.0923 13.7917 20.1118 13.8082 20.1312L11.6664 22.273C11.3735 21.9802 10.8987 21.9802 10.6058 22.273C10.3129 22.5659 10.3129 23.0407 10.6058 23.3336L11.6665 24.3943C11.9594 24.6872 12.4342 24.6872 12.7271 24.3943C13.02 24.1014 13.02 23.6266 12.7271 23.3337L14.8721 21.1887C15.7157 21.8987 16.6489 22.4131 17.4272 22.4891C17.8395 22.5293 18.2063 22.2278 18.2465 21.8155ZM14.8728 19.0668L20.5569 13.3826L22.1479 12.8523L21.6176 14.4433L15.9381 20.1228C15.7916 20.0043 15.6474 19.878 15.5079 19.746C15.4986 19.7373 15.4895 19.7284 15.4803 19.7196C15.4451 19.6861 15.4103 19.6521 15.3758 19.6179C15.3639 19.6061 15.3521 19.5942 15.3402 19.5823C15.1733 19.4142 15.0169 19.2419 14.8728 19.0668Z" fill="#5CA7FF"/>
+</g>
+<defs>
+<clipPath id="clip0_536_3453">
+<rect width="10" height="18" fill="white" transform="translate(20.3286 7.60059) rotate(45)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_defend_dark.svg b/client/public/themes/olympus/images/icons_roe_defend_dark.svg
new file mode 100644
index 00000000..82c305aa
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_defend_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 10.375C17.6172 10.375 17.7637 10.4043 17.8809 10.4629L23.3887 12.8066C24.0332 13.0996 24.5312 13.7148 24.5312 14.4766C24.502 17.4062 23.3008 22.709 18.2617 25.1406C17.7637 25.375 17.207 25.375 16.709 25.1406C11.6699 22.709 10.4688 17.4062 10.4688 14.4766C10.4395 13.7148 10.9375 13.0996 11.582 12.8066L17.0898 10.4629C17.207 10.4043 17.3535 10.375 17.5 10.375ZM17.5 12.3379V23.4121C21.543 21.4492 22.627 17.1426 22.6562 14.5352L17.5 12.3379Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_roe_defend_light.svg b/client/public/themes/olympus/images/icons_roe_defend_light.svg
new file mode 100644
index 00000000..1d956938
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_roe_defend_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 10.375C17.6172 10.375 17.7637 10.4043 17.8809 10.4629L23.3887 12.8066C24.0332 13.0996 24.5312 13.7148 24.5312 14.4766C24.502 17.4062 23.3008 22.709 18.2617 25.1406C17.7637 25.375 17.207 25.375 16.709 25.1406C11.6699 22.709 10.4688 17.4062 10.4688 14.4766C10.4395 13.7148 10.9375 13.0996 11.582 12.8066L17.0898 10.4629C17.207 10.4043 17.3535 10.375 17.5 10.375ZM17.5 12.3379V23.4121C21.543 21.4492 22.627 17.1426 22.6562 14.5352L17.5 12.3379Z" 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
index fcc0c75f..3582a48c 100644
--- a/client/public/themes/olympus/images/icons_roe_stop_dark.svg
+++ b/client/public/themes/olympus/images/icons_roe_stop_dark.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" 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
index 98b50cb4..dc3335a8 100644
--- a/client/public/themes/olympus/images/icons_roe_stop_light.svg
+++ b/client/public/themes/olympus/images/icons_roe_stop_light.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" 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
index 3a2f17db..cb68d86b 100644
--- a/client/public/themes/olympus/images/icons_roe_target_dark.svg
+++ b/client/public/themes/olympus/images/icons_roe_target_dark.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 10.375C17.998 10.375 18.4375 10.8145 18.4375 11.3125V11.6348C21.1621 12.0449 23.3301 14.2129 23.7402 16.9375H24.0625C24.5605 16.9375 25 17.377 25 17.875C25 18.4023 24.5605 18.8125 24.0625 18.8125H23.7402C23.3301 21.5664 21.1621 23.7344 18.4375 24.1445V24.4375C18.4375 24.9648 17.998 25.375 17.5 25.375C16.9727 25.375 16.5625 24.9648 16.5625 24.4375V24.1445C13.8086 23.7344 11.6406 21.5664 11.2305 18.8125H10.9375C10.4102 18.8125 10 18.4023 10 17.875C10 17.377 10.4102 16.9375 10.9375 16.9375H11.2305C11.6406 14.2129 13.8086 12.0449 16.5625 11.6348V11.3125C16.5625 10.8145 16.9727 10.375 17.5 10.375ZM13.1348 18.8125C13.4863 20.541 14.834 21.8887 16.5625 22.2402V21.625C16.5625 21.127 16.9727 20.6875 17.5 20.6875C17.998 20.6875 18.4375 21.127 18.4375 21.625V22.2402C20.1367 21.8887 21.4844 20.541 21.8359 18.8125H21.25C20.7227 18.8125 20.3125 18.4023 20.3125 17.875C20.3125 17.377 20.7227 16.9375 21.25 16.9375H21.8359C21.4844 15.2383 20.1367 13.8906 18.4375 13.5391V14.125C18.4375 14.6523 17.998 15.0625 17.5 15.0625C16.9727 15.0625 16.5625 14.6523 16.5625 14.125V13.5391C14.834 13.8906 13.4863 15.2383 13.1348 16.9375H13.75C14.248 16.9375 14.6875 17.377 14.6875 17.875C14.6875 18.4023 14.248 18.8125 13.75 18.8125H13.1348ZM17.5 18.8125C16.9727 18.8125 16.5625 18.4023 16.5625 17.875C16.5625 17.377 16.9727 16.9375 17.5 16.9375C17.998 16.9375 18.4375 17.377 18.4375 17.875C18.4375 18.4023 17.998 18.8125 17.5 18.8125Z" 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
index 9f8031ff..a9ec508c 100644
--- a/client/public/themes/olympus/images/icons_roe_target_light.svg
+++ b/client/public/themes/olympus/images/icons_roe_target_light.svg
@@ -1,3 +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 width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 10.375C17.998 10.375 18.4375 10.8145 18.4375 11.3125V11.6348C21.1621 12.0449 23.3301 14.2129 23.7402 16.9375H24.0625C24.5605 16.9375 25 17.377 25 17.875C25 18.4023 24.5605 18.8125 24.0625 18.8125H23.7402C23.3301 21.5664 21.1621 23.7344 18.4375 24.1445V24.4375C18.4375 24.9648 17.998 25.375 17.5 25.375C16.9727 25.375 16.5625 24.9648 16.5625 24.4375V24.1445C13.8086 23.7344 11.6406 21.5664 11.2305 18.8125H10.9375C10.4102 18.8125 10 18.4023 10 17.875C10 17.377 10.4102 16.9375 10.9375 16.9375H11.2305C11.6406 14.2129 13.8086 12.0449 16.5625 11.6348V11.3125C16.5625 10.8145 16.9727 10.375 17.5 10.375ZM13.1348 18.8125C13.4863 20.541 14.834 21.8887 16.5625 22.2402V21.625C16.5625 21.127 16.9727 20.6875 17.5 20.6875C17.998 20.6875 18.4375 21.127 18.4375 21.625V22.2402C20.1367 21.8887 21.4844 20.541 21.8359 18.8125H21.25C20.7227 18.8125 20.3125 18.4023 20.3125 17.875C20.3125 17.377 20.7227 16.9375 21.25 16.9375H21.8359C21.4844 15.2383 20.1367 13.8906 18.4375 13.5391V14.125C18.4375 14.6523 17.998 15.0625 17.5 15.0625C16.9727 15.0625 16.5625 14.6523 16.5625 14.125V13.5391C14.834 13.8906 13.4863 15.2383 13.1348 16.9375H13.75C14.248 16.9375 14.6875 17.377 14.6875 17.875C14.6875 18.4023 14.248 18.8125 13.75 18.8125H13.1348ZM17.5 18.8125C16.9727 18.8125 16.5625 18.4023 16.5625 17.875C16.5625 17.377 16.9727 16.9375 17.5 16.9375C17.998 16.9375 18.4375 17.377 18.4375 17.875C18.4375 18.4023 17.998 18.8125 17.5 18.8125Z" fill="#5CA7FF"/>
 </svg>
diff --git a/client/public/themes/olympus/images/icons_threat_cms_dark.svg b/client/public/themes/olympus/images/icons_threat_cms_dark.svg
new file mode 100644
index 00000000..f6f53fd5
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_cms_dark.svg
@@ -0,0 +1,8 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.06 17.2178C5.93975 17.2687 5.8623 17.3869 5.8623 17.5174C5.8623 17.6478 5.93975 17.766 6.06 17.817L8.15719 18.7157C8.32023 18.7851 8.49348 18.8217 8.6708 18.8217L10.2401 18.8217L11.9521 21.7566L11.569 21.7566C11.2979 21.7566 11.0798 21.9747 11.0798 22.2457C11.0798 22.5168 11.2979 22.7349 11.569 22.7349L12.7103 22.7349L13.3625 22.7349L13.8516 22.7349C14.1227 22.7349 14.3408 22.5168 14.3408 22.2457C14.3408 21.9747 14.1227 21.7566 13.8516 21.7566L13.6886 21.7566L13.6886 18.8217L14.355 18.8217L15.4006 20.014C15.4617 20.0853 15.5514 20.1261 15.6451 20.1261L15.9712 20.1261C16.1506 20.1261 16.2973 19.9794 16.2973 19.8L16.2973 17.8434L14.9929 17.8434C14.8136 17.8434 14.6669 17.6967 14.6669 17.5174C14.6669 17.338 14.8136 17.1913 14.9929 17.1913L16.2973 17.1913L16.2973 15.2347C16.2973 15.0553 16.1506 14.9086 15.9712 14.9086L15.6451 14.9086C15.5514 14.9086 15.4617 14.9493 15.4006 15.0206L14.355 16.213L13.6886 16.213L13.6886 13.2781L13.8516 13.2781C14.1227 13.2781 14.3408 13.06 14.3408 12.789C14.3408 12.5179 14.1227 12.2998 13.8516 12.2998L13.3625 12.2998L12.7103 12.2998L11.569 12.2998C11.2979 12.2998 11.0798 12.5179 11.0798 12.789C11.0798 13.06 11.2979 13.2781 11.569 13.2781L11.9521 13.2781L10.2401 16.213L8.6708 16.213C8.49348 16.213 8.32023 16.2497 8.15719 16.319L6.06 17.2178Z" fill="#202831"/>
+<path d="M18.7021 17.313H29.1372" stroke="#202831" stroke-dasharray="2 2"/>
+<path d="M22.2739 19.7632L22.1739 20.6616L23.0845 20.4077L23.1651 21.0229L22.335 21.0815L22.8794 21.8066L22.3252 22.1021L21.9444 21.3379L21.6099 22.0972L21.0337 21.8066L21.5733 21.0815L20.7481 21.0181L20.8433 20.4077L21.7344 20.6616L21.6343 19.7632H22.2739Z" fill="#202831"/>
+<path d="M27.2739 21.4214L27.1739 22.3198L28.0845 22.0659L28.1651 22.6812L27.335 22.7397L27.8794 23.4648L27.3252 23.7603L26.9444 22.9961L26.6099 23.7554L26.0337 23.4648L26.5733 22.7397L25.7481 22.6763L25.8433 22.0659L26.7344 22.3198L26.6343 21.4214H27.2739Z" fill="#202831"/>
+<path d="M27.2739 10.7632L27.1739 11.6616L28.0845 11.4077L28.1651 12.0229L27.335 12.0815L27.8794 12.8066L27.3252 13.1021L26.9444 12.3379L26.6099 13.0972L26.0337 12.8066L26.5733 12.0815L25.7481 12.0181L25.8433 11.4077L26.7344 11.6616L26.6343 10.7632H27.2739Z" fill="#202831"/>
+<path d="M22.2739 12.4214L22.1739 13.3198L23.0845 13.0659L23.1651 13.6812L22.335 13.7397L22.8794 14.4648L22.3252 14.7603L21.9444 13.9961L21.6099 14.7554L21.0337 14.4648L21.5733 13.7397L20.7481 13.6763L20.8433 13.0659L21.7344 13.3198L21.6343 12.4214H22.2739Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_cms_light.svg b/client/public/themes/olympus/images/icons_threat_cms_light.svg
new file mode 100644
index 00000000..6032f934
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_cms_light.svg
@@ -0,0 +1,8 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.06 17.2178C5.93975 17.2687 5.8623 17.3869 5.8623 17.5174C5.8623 17.6478 5.93975 17.766 6.06 17.817L8.15719 18.7157C8.32023 18.7851 8.49348 18.8217 8.6708 18.8217L10.2401 18.8217L11.9521 21.7566L11.569 21.7566C11.2979 21.7566 11.0798 21.9747 11.0798 22.2457C11.0798 22.5168 11.2979 22.7349 11.569 22.7349L12.7103 22.7349L13.3625 22.7349L13.8516 22.7349C14.1227 22.7349 14.3408 22.5168 14.3408 22.2457C14.3408 21.9747 14.1227 21.7566 13.8516 21.7566L13.6886 21.7566L13.6886 18.8217L14.355 18.8217L15.4006 20.014C15.4617 20.0853 15.5514 20.1261 15.6451 20.1261L15.9712 20.1261C16.1506 20.1261 16.2973 19.9794 16.2973 19.8L16.2973 17.8434L14.9929 17.8434C14.8136 17.8434 14.6669 17.6967 14.6669 17.5174C14.6669 17.338 14.8136 17.1913 14.9929 17.1913L16.2973 17.1913L16.2973 15.2347C16.2973 15.0553 16.1506 14.9086 15.9712 14.9086L15.6451 14.9086C15.5514 14.9086 15.4617 14.9493 15.4006 15.0206L14.355 16.213L13.6886 16.213L13.6886 13.2781L13.8516 13.2781C14.1227 13.2781 14.3408 13.06 14.3408 12.789C14.3408 12.5179 14.1227 12.2998 13.8516 12.2998L13.3625 12.2998L12.7103 12.2998L11.569 12.2998C11.2979 12.2998 11.0798 12.5179 11.0798 12.789C11.0798 13.06 11.2979 13.2781 11.569 13.2781L11.9521 13.2781L10.2401 16.213L8.6708 16.213C8.49348 16.213 8.32023 16.2497 8.15719 16.319L6.06 17.2178Z" fill="#5CA7FF"/>
+<path d="M18.7021 17.313H29.1372" stroke="#5CA7FF" stroke-dasharray="2 2"/>
+<path d="M22.2739 19.7632L22.1739 20.6616L23.0845 20.4077L23.1651 21.0229L22.335 21.0815L22.8794 21.8066L22.3252 22.1021L21.9444 21.3379L21.6099 22.0972L21.0337 21.8066L21.5733 21.0815L20.7481 21.0181L20.8433 20.4077L21.7344 20.6616L21.6343 19.7632H22.2739Z" fill="#5CA7FF"/>
+<path d="M27.2739 21.4214L27.1739 22.3198L28.0845 22.0659L28.1651 22.6812L27.335 22.7397L27.8794 23.4648L27.3252 23.7603L26.9444 22.9961L26.6099 23.7554L26.0337 23.4648L26.5733 22.7397L25.7481 22.6763L25.8433 22.0659L26.7344 22.3198L26.6343 21.4214H27.2739Z" fill="#5CA7FF"/>
+<path d="M27.2739 10.7632L27.1739 11.6616L28.0845 11.4077L28.1651 12.0229L27.335 12.0815L27.8794 12.8066L27.3252 13.1021L26.9444 12.3379L26.6099 13.0972L26.0337 12.8066L26.5733 12.0815L25.7481 12.0181L25.8433 11.4077L26.7344 11.6616L26.6343 10.7632H27.2739Z" fill="#5CA7FF"/>
+<path d="M22.2739 12.4214L22.1739 13.3198L23.0845 13.0659L23.1651 13.6812L22.335 13.7397L22.8794 14.4648L22.3252 14.7603L21.9444 13.9961L21.6099 14.7554L21.0337 14.4648L21.5733 13.7397L20.7481 13.6763L20.8433 13.0659L21.7344 13.3198L21.6343 12.4214H22.2739Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_defend_dark.svg b/client/public/themes/olympus/images/icons_threat_defend_dark.svg
new file mode 100644
index 00000000..962971eb
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_defend_dark.svg
@@ -0,0 +1,7 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.75589 22.6552C5.71059 22.7671 5.73725 22.895 5.82251 22.9802C5.90777 23.0655 6.03565 23.0921 6.14756 23.0468L8.10587 22.2635C8.25775 22.2022 8.39497 22.113 8.51087 21.9971L9.53665 20.9713L12.574 21.7706L12.3236 22.021C12.1464 22.1982 12.1464 22.4833 12.3236 22.6605C12.5008 22.8377 12.7859 22.8377 12.963 22.6605L13.7091 21.9145L14.1354 21.4882L14.4551 21.1684C14.6323 20.9913 14.6323 20.7062 14.4551 20.529C14.2779 20.3518 13.9928 20.3518 13.8156 20.529L13.7091 20.6356L11.7907 18.7172L12.2263 18.2816L13.6891 18.3775C13.7757 18.3841 13.8609 18.3522 13.9222 18.2909L14.1354 18.0778C14.2526 17.9605 14.2526 17.7687 14.1354 17.6515L12.8565 16.3726L12.0039 17.2252C11.8866 17.3424 11.6948 17.3424 11.5776 17.2252C11.4603 17.1079 11.4603 16.9161 11.5776 16.7989L12.4302 15.9463L11.1513 14.6674C11.034 14.5501 10.8422 14.5501 10.725 14.6674L10.5118 14.8805C10.4505 14.9418 10.4185 15.027 10.4252 15.1136L10.5211 16.5764L10.0855 17.012L8.16716 15.0937L8.27373 14.9871C8.4509 14.8099 8.4509 14.5248 8.27373 14.3476C8.09656 14.1705 7.81145 14.1705 7.63428 14.3476L7.31456 14.6674L6.88826 15.0937L6.14223 15.8397C5.96506 16.0169 5.96506 16.302 6.14223 16.4791C6.3194 16.6563 6.60451 16.6563 6.78168 16.4791L7.03209 16.2287L7.83145 19.2661L6.80567 20.2919C6.68976 20.4078 6.6005 20.545 6.53922 20.6969L5.75589 22.6552Z" fill="#202831"/>
+<path d="M14.8257 13.4509C17.3895 11.1202 23.2162 7.01815 26.013 9.25562C29.5091 12.0525 30.2083 18.3452 23.2162 26.0365" stroke="#202831" stroke-linecap="round" stroke-dasharray="2 2"/>
+<path d="M20.5171 20.9448L20.417 21.8433L21.3276 21.5894L21.4082 22.2046L20.5781 22.2632L21.1225 22.9883L20.5683 23.2837L20.1875 22.5195L19.853 23.2788L19.2768 22.9883L19.8164 22.2632L18.9912 22.1997L19.0864 21.5894L19.9775 21.8433L19.8774 20.9448H20.5171Z" fill="#202831"/>
+<path d="M19.1186 15.3511L19.0185 16.2495L19.9292 15.9956L20.0097 16.6108L19.1797 16.6694L19.7241 17.3945L19.1699 17.6899L18.789 16.9258L18.4546 17.6851L17.8784 17.3945L18.4179 16.6694L17.5927 16.606L17.688 15.9956L18.5791 16.2495L18.479 15.3511H19.1186Z" fill="#202831"/>
+<path d="M24.7119 15.3511L24.6118 16.2495L25.5224 15.9956L25.603 16.6108L24.7729 16.6694L25.3174 17.3945L24.7632 17.6899L24.3823 16.9258L24.0478 17.6851L23.4717 17.3945L24.0112 16.6694L23.186 16.606L23.2812 15.9956L24.1723 16.2495L24.0722 15.3511H24.7119Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_defend_light.svg b/client/public/themes/olympus/images/icons_threat_defend_light.svg
new file mode 100644
index 00000000..0e598866
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_defend_light.svg
@@ -0,0 +1,7 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.75589 22.6552C5.71059 22.7671 5.73725 22.895 5.82251 22.9802C5.90777 23.0655 6.03565 23.0921 6.14756 23.0468L8.10587 22.2635C8.25775 22.2022 8.39497 22.113 8.51087 21.9971L9.53665 20.9713L12.574 21.7706L12.3236 22.021C12.1464 22.1982 12.1464 22.4833 12.3236 22.6605C12.5008 22.8377 12.7859 22.8377 12.963 22.6605L13.7091 21.9145L14.1354 21.4882L14.4551 21.1684C14.6323 20.9913 14.6323 20.7062 14.4551 20.529C14.2779 20.3518 13.9928 20.3518 13.8156 20.529L13.7091 20.6356L11.7907 18.7172L12.2263 18.2816L13.6891 18.3775C13.7757 18.3841 13.8609 18.3522 13.9222 18.2909L14.1354 18.0778C14.2526 17.9605 14.2526 17.7687 14.1354 17.6515L12.8565 16.3726L12.0039 17.2252C11.8866 17.3424 11.6948 17.3424 11.5776 17.2252C11.4603 17.1079 11.4603 16.9161 11.5776 16.7989L12.4302 15.9463L11.1513 14.6674C11.034 14.5501 10.8422 14.5501 10.725 14.6674L10.5118 14.8805C10.4505 14.9418 10.4185 15.027 10.4252 15.1136L10.5211 16.5764L10.0855 17.012L8.16716 15.0937L8.27373 14.9871C8.4509 14.8099 8.4509 14.5248 8.27373 14.3476C8.09656 14.1705 7.81145 14.1705 7.63428 14.3476L7.31456 14.6674L6.88826 15.0937L6.14223 15.8397C5.96506 16.0169 5.96506 16.302 6.14223 16.4791C6.3194 16.6563 6.60451 16.6563 6.78168 16.4791L7.03209 16.2287L7.83145 19.2661L6.80567 20.2919C6.68976 20.4078 6.6005 20.545 6.53922 20.6969L5.75589 22.6552Z" fill="#5CA7FF"/>
+<path d="M14.8257 13.4509C17.3895 11.1202 23.2162 7.01815 26.013 9.25562C29.5091 12.0525 30.2083 18.3452 23.2162 26.0365" stroke="#5CA7FF" stroke-linecap="round" stroke-dasharray="2 2"/>
+<path d="M20.5171 20.9448L20.417 21.8433L21.3276 21.5894L21.4082 22.2046L20.5781 22.2632L21.1225 22.9883L20.5683 23.2837L20.1875 22.5195L19.853 23.2788L19.2768 22.9883L19.8164 22.2632L18.9912 22.1997L19.0864 21.5894L19.9775 21.8433L19.8774 20.9448H20.5171Z" fill="#5CA7FF"/>
+<path d="M19.1186 15.3511L19.0185 16.2495L19.9292 15.9956L20.0097 16.6108L19.1797 16.6694L19.7241 17.3945L19.1699 17.6899L18.789 16.9258L18.4546 17.6851L17.8784 17.3945L18.4179 16.6694L17.5927 16.606L17.688 15.9956L18.5791 16.2495L18.479 15.3511H19.1186Z" fill="#5CA7FF"/>
+<path d="M24.7119 15.3511L24.6118 16.2495L25.5224 15.9956L25.603 16.6108L24.7729 16.6694L25.3174 17.3945L24.7632 17.6899L24.3823 16.9258L24.0478 17.6851L23.4717 17.3945L24.0112 16.6694L23.186 16.606L23.2812 15.9956L24.1723 16.2495L24.0722 15.3511H24.7119Z" fill="#5CA7FF"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_nothing_dark.svg b/client/public/themes/olympus/images/icons_threat_nothing_dark.svg
new file mode 100644
index 00000000..3582a48c
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_nothing_dark.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" fill="#202831"/>
+</svg>
diff --git a/client/public/themes/olympus/images/icons_threat_nothing_light.svg b/client/public/themes/olympus/images/icons_threat_nothing_light.svg
new file mode 100644
index 00000000..dc3335a8
--- /dev/null
+++ b/client/public/themes/olympus/images/icons_threat_nothing_light.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.582 14.7988C21.9629 14.4473 21.9629 13.832 21.582 13.4805C21.2305 13.0996 20.6152 13.0996 20.2637 13.4805L17.1875 16.5566L14.082 13.4805C13.7305 13.0996 13.1152 13.0996 12.7637 13.4805C12.3828 13.832 12.3828 14.4473 12.7637 14.7988L15.8398 17.875L12.7637 20.9805C12.3828 21.332 12.3828 21.9473 12.7637 22.2988C13.1152 22.6797 13.7305 22.6797 14.082 22.2988L17.1875 19.2227L20.2637 22.2988C20.6152 22.6797 21.2305 22.6797 21.582 22.2988C21.9629 21.9473 21.9629 21.332 21.582 20.9805L18.5059 17.875L21.582 14.7988Z" fill="#5CA7FF"/>
+</svg>