diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index a39ba881..2c82606e 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -98,19 +98,20 @@ button[disabled="disabled"] {
 }
 
 .ol-select:not( .ol-select-image ) > .ol-select-value {
+    align-items: center;
     background-color: var( --background-grey );
     border-radius: var( --border-radius-sm );
+    justify-content: center;
     padding:1em;
     width:100%;
 }
 
-.ol-select:not( .ol-select-image ) > .ol-select-value:before {
-    content: "[ ]";
+.ol-select:not( .ol-select-image ) > .ol-select-value svg {
     margin-right: 10px;
 }
 
 .ol-select:not( .ol-select-image ) > .ol-select-value:after {
-    content: "[V]";
+    content: url( "/themes/olympus/images/chevron-down.svg" );
     margin-left:10px;
 }
 
@@ -423,4 +424,35 @@ nav.ol-panel > :last-child {
 #unit-info-panel {
     display: flex;
     flex-direction: column;
+}
+
+
+#visibility-control {
+    align-items: center;
+}
+
+#visibility-control button {
+    border:none;
+    height:32px;
+    width:32px;
+}
+
+#visibility-control-aircraft {
+    background-image: var( --visibility-control-aircraft-visible-url );
+}
+
+#visibility-control-ground {
+    background-image: var( --visibility-control-ground-visible-url );
+}
+
+#visibility-control-sam {
+    background-image: var( --visibility-control-sam-visible-url );
+}
+
+#visibility-control-naval {
+    background-image: var( --visibility-control-naval-visible-url );
+}
+
+#visibility-control-threat {
+    background-image: var( --visibility-control-threat-visible-url );
 }
\ No newline at end of file
diff --git a/client/public/themes/olympus/images/chevron-down.svg b/client/public/themes/olympus/images/chevron-down.svg
new file mode 100644
index 00000000..800f4fe2
--- /dev/null
+++ b/client/public/themes/olympus/images/chevron-down.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="8" viewBox="0 0 14 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.37109 7.37891C6.69922 7.73438 7.27344 7.73438 7.60156 7.37891L12.8516 2.12891C13.207 1.80078 13.207 1.22656 12.8516 0.898438C12.5234 0.542969 11.9492 0.542969 11.6211 0.898438L7 5.51953L2.35156 0.898438C2.02344 0.542969 1.44922 0.542969 1.12109 0.898438C0.765625 1.22656 0.765625 1.80078 1.12109 2.12891L6.37109 7.37891Z" fill="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_aircraft_hidden.svg b/client/public/themes/olympus/images/visibility_aircraft_hidden.svg
new file mode 100644
index 00000000..7acbb8dd
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_aircraft_hidden.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.3047 14C22.2344 14 23.875 14.793 23.875 15.75C23.875 16.7344 22.2344 17.5 21.3047 17.5H18.1055L15.3711 22.3125C15.207 22.5859 14.9062 22.75 14.6055 22.75H13.0742C12.7734 22.75 12.5547 22.4766 12.6367 22.2031L13.9766 17.5H11.1875L9.98438 19.0859C9.90234 19.1953 9.79297 19.25 9.65625 19.25H8.50781C8.28906 19.25 8.125 19.0859 8.125 18.8672C8.125 18.8398 8.125 18.8125 8.125 18.7852L9 15.75L8.125 12.7422C8.125 12.7148 8.125 12.6875 8.125 12.6328C8.125 12.4414 8.28906 12.25 8.50781 12.25H9.65625C9.79297 12.25 9.90234 12.332 9.98438 12.4414L11.1875 14H13.9766L12.6367 9.32422C12.5547 9.05078 12.7734 8.75 13.0742 8.75H14.6055C14.9062 8.75 15.207 8.94141 15.3711 9.21484L18.1055 14H21.3047Z" fill="white"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_aircraft_visible.svg b/client/public/themes/olympus/images/visibility_aircraft_visible.svg
new file mode 100644
index 00000000..000472f4
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_aircraft_visible.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
+<path d="M21.3047 14C22.2344 14 23.875 14.793 23.875 15.75C23.875 16.7344 22.2344 17.5 21.3047 17.5H18.1055L15.3711 22.3125C15.207 22.5859 14.9062 22.75 14.6055 22.75H13.0742C12.7734 22.75 12.5547 22.4766 12.6367 22.2031L13.9766 17.5H11.1875L9.98438 19.0859C9.90234 19.1953 9.79297 19.25 9.65625 19.25H8.50781C8.28906 19.25 8.125 19.0859 8.125 18.8672C8.125 18.8398 8.125 18.8125 8.125 18.7852L9 15.75L8.125 12.7422C8.125 12.7148 8.125 12.6875 8.125 12.6328C8.125 12.4414 8.28906 12.25 8.50781 12.25H9.65625C9.79297 12.25 9.90234 12.332 9.98438 12.4414L11.1875 14H13.9766L12.6367 9.32422C12.5547 9.05078 12.7734 8.75 13.0742 8.75H14.6055C14.9062 8.75 15.207 8.94141 15.3711 9.21484L18.1055 14H21.3047Z" fill="#202831"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_ground_hidden.svg b/client/public/themes/olympus/images/visibility_ground_hidden.svg
new file mode 100644
index 00000000..4993ba3e
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_ground_hidden.svg
@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_277_1705)">
+<path d="M22.4511 18.3916H9.54882C8.6 18.3916 7.82812 19.1635 7.82812 20.1123C7.82812 20.1385 7.8289 20.1645 7.83013 20.1905C7.8305 20.1988 7.83098 20.207 7.83146 20.2153C7.83254 20.2336 7.83395 20.2518 7.83562 20.27C7.8364 20.2788 7.83707 20.2875 7.83803 20.2962C7.84056 20.3194 7.84345 20.3426 7.8469 20.3656C7.84865 20.3772 7.85072 20.3887 7.85269 20.4003C7.85484 20.4128 7.857 20.4253 7.85941 20.4377C7.86201 20.4512 7.86471 20.4646 7.86761 20.478C7.86972 20.4877 7.87203 20.4973 7.87433 20.507C7.88112 20.5359 7.88861 20.5644 7.89685 20.5927C7.89826 20.5976 7.8996 20.6025 7.90105 20.6074C7.90565 20.6228 7.91062 20.6379 7.91559 20.653C7.91808 20.6605 7.92064 20.668 7.9232 20.6755C7.92839 20.6903 7.93363 20.7052 7.93919 20.7199C7.94164 20.7264 7.94428 20.7327 7.94676 20.7391C7.9566 20.7642 7.96699 20.789 7.97794 20.8135C7.98228 20.8232 7.98658 20.8329 7.99111 20.8426C7.99649 20.8539 8.00198 20.8652 8.00759 20.8765C8.01364 20.8887 8.01987 20.9007 8.02622 20.9128C8.03089 20.9217 8.03557 20.9307 8.04039 20.9395C8.0519 20.9605 8.06381 20.9812 8.07616 21.0017C8.07806 21.0048 8.08002 21.0078 8.08195 21.0109C8.09394 21.0304 8.1063 21.0496 8.11903 21.0687C8.12129 21.072 8.12348 21.0753 8.12574 21.0787C8.29288 21.3247 8.52359 21.528 8.80106 21.662C8.8044 21.6636 8.80781 21.6651 8.81119 21.6667C8.8244 21.6729 8.83758 21.6793 8.85101 21.6853L8.86225 21.6898C8.89383 21.7036 8.92571 21.7168 8.95826 21.7287L11.5773 22.7895C11.5813 22.7913 11.5855 22.7927 11.5895 22.7945C11.6066 22.8018 11.6241 22.8085 11.6413 22.8154C11.6593 22.8225 11.6771 22.83 11.6952 22.8367C11.7131 22.8433 11.7313 22.8493 11.7495 22.8555C11.7677 22.8617 11.7858 22.8683 11.8042 22.8741C11.8198 22.879 11.8358 22.8832 11.8515 22.8877C11.8728 22.8939 11.894 22.9004 11.9154 22.906C11.9257 22.9086 11.9363 22.9108 11.9467 22.9133C11.9737 22.9199 12.0007 22.9265 12.028 22.9321C12.0289 22.9323 12.0298 22.9324 12.0306 22.9325C12.1748 22.962 12.322 22.9771 12.4713 22.9783C12.4775 22.9783 12.4836 22.9787 12.4897 22.9787H12.4898H19.5098C19.5103 22.9787 19.5107 22.9787 19.5111 22.9787C19.5115 22.9787 19.512 22.9787 19.5124 22.9787C19.8402 22.9787 20.1518 22.9092 20.4341 22.7847L23.0686 21.7179C23.0894 21.7099 23.1102 21.7017 23.1306 21.6928L23.1321 21.6922L23.1485 21.6853C23.1619 21.6793 23.1751 21.6729 23.1883 21.6667C23.1917 21.6651 23.1951 21.6635 23.1985 21.662C23.4759 21.528 23.7067 21.3247 23.8738 21.0787C23.876 21.0754 23.8783 21.072 23.8805 21.0687C23.8932 21.0496 23.9056 21.0304 23.9176 21.0109C23.9195 21.0078 23.9215 21.0047 23.9233 21.0017C23.9357 20.9812 23.9476 20.9604 23.9592 20.9395C23.964 20.9306 23.9687 20.9217 23.9733 20.9128C23.9797 20.9007 23.9859 20.8887 23.992 20.8765C23.9976 20.8652 24.0031 20.854 24.0084 20.8426C24.0129 20.8329 24.0173 20.8232 24.0216 20.8135C24.0326 20.789 24.043 20.7642 24.0528 20.7391C24.0553 20.7327 24.058 20.7263 24.0604 20.7199C24.066 20.7052 24.0712 20.6903 24.0764 20.6754C24.079 20.668 24.0815 20.6605 24.084 20.653C24.089 20.6378 24.094 20.6227 24.0985 20.6074C24.1 20.6025 24.1013 20.5975 24.1027 20.5926C24.1109 20.5644 24.1185 20.5358 24.1253 20.507C24.1276 20.4973 24.1298 20.4877 24.132 20.4779C24.1349 20.4646 24.1376 20.4512 24.1402 20.4377C24.1426 20.4252 24.1447 20.4127 24.1469 20.4002C24.1489 20.3887 24.1509 20.3772 24.1527 20.3656C24.1561 20.3425 24.159 20.3194 24.1616 20.2961C24.1625 20.2874 24.1631 20.2787 24.164 20.27C24.1657 20.2518 24.167 20.2336 24.1681 20.2152C24.1686 20.207 24.1691 20.1988 24.1695 20.1905C24.1706 20.1645 24.1715 20.1384 24.1715 20.1123C24.1718 19.1635 23.3999 18.3916 22.4511 18.3916ZM9.54882 20.7573C9.46599 20.7573 9.38698 20.7411 9.31417 20.7125L9.29001 20.7027C9.27506 20.6961 9.26033 20.6891 9.24604 20.6814C9.24433 20.6806 9.24251 20.6798 9.24081 20.6788C9.224 20.6696 9.20767 20.6596 9.19179 20.649C9.18856 20.6468 9.18544 20.6446 9.18225 20.6423C9.16933 20.6333 9.15675 20.624 9.14458 20.6141C9.14139 20.6116 9.13816 20.609 9.13505 20.6064C9.10599 20.5821 9.07916 20.5552 9.05481 20.5261C9.05177 20.5225 9.04888 20.5188 9.04591 20.5151C9.03704 20.5041 9.02858 20.4927 9.02041 20.4811C9.01722 20.4766 9.01399 20.472 9.01091 20.4674C9.00104 20.4525 8.99162 20.4373 8.98301 20.4215C8.98082 20.4176 8.979 20.4134 8.97689 20.4094C8.97054 20.3972 8.96449 20.3848 8.95896 20.3722C8.95596 20.3654 8.95313 20.3586 8.95039 20.3517C8.94594 20.3405 8.94178 20.3292 8.93792 20.3177C8.93577 20.3114 8.93347 20.3052 8.93154 20.2987C8.92642 20.2818 8.922 20.2647 8.91825 20.2472C8.91706 20.2415 8.91614 20.2357 8.9151 20.23C8.91254 20.2163 8.91042 20.2025 8.90875 20.1886C8.90805 20.1826 8.90734 20.1766 8.90679 20.1707C8.90504 20.1515 8.90382 20.1321 8.90382 20.1124C8.90382 19.7568 9.19312 19.4674 9.54878 19.4674C9.90444 19.4674 10.1937 19.7567 10.1937 20.1124C10.1937 20.4681 9.90447 20.7573 9.54882 20.7573ZM12.4899 21.9029C12.469 21.9029 12.448 21.9024 12.4273 21.9014C12.3666 21.8983 12.3071 21.8907 12.2491 21.879C12.2476 21.8787 12.246 21.8784 12.2445 21.8781C12.2289 21.8749 12.2135 21.8712 12.198 21.8674C12.1936 21.8663 12.1891 21.8654 12.1847 21.8642C12.1715 21.8608 12.1584 21.8569 12.1453 21.853C12.1387 21.8511 12.1321 21.8493 12.1255 21.8472C12.114 21.8436 12.1027 21.8396 12.0914 21.8356C12.0834 21.8328 12.0753 21.8302 12.0673 21.8272C12.0567 21.8232 12.0462 21.8189 12.0356 21.8147C12.0273 21.8113 12.019 21.808 12.0107 21.8045C11.5768 21.618 11.2721 21.1866 11.2721 20.6851C11.2721 20.0136 11.8184 19.4673 12.4899 19.4673C13.1614 19.4673 13.7077 20.0136 13.7077 20.6851C13.7077 21.3566 13.1614 21.9029 12.4899 21.9029ZM16.0013 21.9029C15.3298 21.9029 14.7835 21.3566 14.7835 20.6852C14.7835 20.0137 15.3298 19.4674 16.0013 19.4674C16.6728 19.4674 17.219 20.0137 17.219 20.6852C17.219 21.3566 16.6728 21.9029 16.0013 21.9029ZM20.0189 21.7923L20.0122 21.795L19.9981 21.801C19.8441 21.8685 19.6803 21.9027 19.5114 21.9029C18.8405 21.9023 18.2949 21.3563 18.2949 20.6852C18.2949 20.0137 18.8412 19.4674 19.5127 19.4674C20.1842 19.4674 20.7304 20.0137 20.7304 20.6852C20.7304 21.176 20.4382 21.5997 20.0189 21.7923ZM23.0931 20.1706C23.0926 20.1766 23.0919 20.1825 23.0912 20.1885C23.0895 20.2024 23.0874 20.2162 23.0848 20.2299C23.0837 20.2356 23.0829 20.2415 23.0816 20.2472C23.0779 20.2646 23.0735 20.2817 23.0684 20.2986C23.0664 20.3051 23.0641 20.3113 23.062 20.3177C23.0581 20.3292 23.054 20.3405 23.0495 20.3516C23.0468 20.3585 23.0439 20.3653 23.041 20.3721C23.0354 20.3847 23.0293 20.3972 23.023 20.4093C23.0209 20.4133 23.0191 20.4174 23.0169 20.4215C23.0083 20.4372 22.9989 20.4524 22.9891 20.4673C22.986 20.472 22.9827 20.4765 22.9795 20.481C22.9714 20.4927 22.963 20.504 22.9541 20.515C22.9511 20.5187 22.9482 20.5224 22.9452 20.5261C22.9208 20.5551 22.8939 20.5819 22.8649 20.6063C22.8618 20.609 22.8586 20.6115 22.8554 20.614C22.8432 20.6239 22.8306 20.6333 22.8178 20.6422C22.8146 20.6444 22.8114 20.6467 22.8082 20.6489C22.7923 20.6595 22.776 20.6695 22.7592 20.6787C22.7575 20.6797 22.7557 20.6805 22.754 20.6814C22.7397 20.689 22.7249 20.696 22.71 20.7026L22.6858 20.7124C22.613 20.741 22.534 20.7573 22.4512 20.7573C22.0956 20.7573 21.8063 20.4679 21.8063 20.1123C21.8063 19.7566 22.0956 19.4673 22.4512 19.4673C22.8068 19.4673 23.0962 19.7566 23.0962 20.1123C23.0961 20.132 23.0948 20.1514 23.0931 20.1706Z" fill="white"/>
+<path d="M22.4512 16.24H22.1936L19.7359 13.893H18.3393C18.2825 13.591 18.1769 13.3061 18.0306 13.0468L22.9532 11.0072L23.1578 11.5011L24.1981 11.0701L23.9934 10.5762L25.2352 10.0617L24.8042 9.02148L23.5624 9.5359L23.3578 9.04204L22.3176 9.473L22.5222 9.96688L17.2366 12.1569C16.7786 11.8245 16.216 11.6278 15.608 11.6278H13.5135C12.1565 11.6278 11.0243 12.6053 10.7821 13.893H9.06456V16.2701C8.05574 16.3958 7.13969 16.9114 6.5 17.7281L7.34687 18.3915C7.88236 17.7078 8.68493 17.3157 9.54888 17.3157H22.4511C23.3151 17.3157 24.1176 17.7078 24.6531 18.3915L25.5 17.7281C24.7593 16.7824 23.648 16.24 22.4512 16.24Z" fill="white"/>
+</g>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+<defs>
+<clipPath id="clip0_277_1705">
+<rect width="19" height="19" fill="white" transform="translate(6.5 6.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_ground_visible.svg b/client/public/themes/olympus/images/visibility_ground_visible.svg
new file mode 100644
index 00000000..4f14666c
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_ground_visible.svg
@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
+<g clip-path="url(#clip0_277_1733)">
+<path d="M22.4511 18.3916H9.54882C8.6 18.3916 7.82812 19.1635 7.82812 20.1123C7.82812 20.1385 7.8289 20.1645 7.83013 20.1905C7.8305 20.1988 7.83098 20.207 7.83146 20.2153C7.83254 20.2336 7.83395 20.2518 7.83562 20.27C7.8364 20.2788 7.83707 20.2875 7.83803 20.2962C7.84056 20.3194 7.84345 20.3426 7.8469 20.3656C7.84865 20.3772 7.85072 20.3887 7.85269 20.4003C7.85484 20.4128 7.857 20.4253 7.85941 20.4377C7.86201 20.4512 7.86471 20.4646 7.86761 20.478C7.86972 20.4877 7.87203 20.4973 7.87433 20.507C7.88112 20.5359 7.88861 20.5644 7.89685 20.5927C7.89826 20.5976 7.8996 20.6025 7.90105 20.6074C7.90565 20.6228 7.91062 20.6379 7.91559 20.653C7.91808 20.6605 7.92064 20.668 7.9232 20.6755C7.92839 20.6903 7.93363 20.7052 7.93919 20.7199C7.94164 20.7264 7.94428 20.7327 7.94676 20.7391C7.9566 20.7642 7.96699 20.789 7.97794 20.8135C7.98228 20.8232 7.98658 20.8329 7.99111 20.8426C7.99649 20.8539 8.00198 20.8652 8.00759 20.8765C8.01364 20.8887 8.01987 20.9007 8.02622 20.9128C8.03089 20.9217 8.03557 20.9307 8.04039 20.9395C8.0519 20.9605 8.06381 20.9812 8.07616 21.0017C8.07806 21.0048 8.08002 21.0078 8.08195 21.0109C8.09394 21.0304 8.1063 21.0496 8.11903 21.0687C8.12129 21.072 8.12348 21.0753 8.12574 21.0787C8.29288 21.3247 8.52359 21.528 8.80106 21.662C8.8044 21.6636 8.80781 21.6651 8.81119 21.6667C8.8244 21.6729 8.83758 21.6793 8.85101 21.6853L8.86225 21.6898C8.89383 21.7036 8.92571 21.7168 8.95826 21.7287L11.5773 22.7895C11.5813 22.7913 11.5855 22.7927 11.5895 22.7945C11.6066 22.8018 11.6241 22.8085 11.6413 22.8154C11.6593 22.8225 11.6771 22.83 11.6952 22.8367C11.7131 22.8433 11.7313 22.8493 11.7495 22.8555C11.7677 22.8617 11.7858 22.8683 11.8042 22.8741C11.8198 22.879 11.8358 22.8832 11.8515 22.8877C11.8728 22.8939 11.894 22.9004 11.9154 22.906C11.9257 22.9086 11.9363 22.9108 11.9467 22.9133C11.9737 22.9199 12.0007 22.9265 12.028 22.9321C12.0289 22.9323 12.0298 22.9324 12.0306 22.9325C12.1748 22.962 12.322 22.9771 12.4713 22.9783C12.4775 22.9783 12.4836 22.9787 12.4897 22.9787H12.4898H19.5098C19.5103 22.9787 19.5107 22.9787 19.5111 22.9787C19.5115 22.9787 19.512 22.9787 19.5124 22.9787C19.8402 22.9787 20.1518 22.9092 20.4341 22.7847L23.0686 21.7179C23.0894 21.7099 23.1102 21.7017 23.1306 21.6928L23.1321 21.6922L23.1485 21.6853C23.1619 21.6793 23.1751 21.6729 23.1883 21.6667C23.1917 21.6651 23.1951 21.6635 23.1985 21.662C23.4759 21.528 23.7067 21.3247 23.8738 21.0787C23.876 21.0754 23.8783 21.072 23.8805 21.0687C23.8932 21.0496 23.9056 21.0304 23.9176 21.0109C23.9195 21.0078 23.9215 21.0047 23.9233 21.0017C23.9357 20.9812 23.9476 20.9604 23.9592 20.9395C23.964 20.9306 23.9687 20.9217 23.9733 20.9128C23.9797 20.9007 23.9859 20.8887 23.992 20.8765C23.9976 20.8652 24.0031 20.854 24.0084 20.8426C24.0129 20.8329 24.0173 20.8232 24.0216 20.8135C24.0326 20.789 24.043 20.7642 24.0528 20.7391C24.0553 20.7327 24.058 20.7263 24.0604 20.7199C24.066 20.7052 24.0712 20.6903 24.0764 20.6754C24.079 20.668 24.0815 20.6605 24.084 20.653C24.089 20.6378 24.094 20.6227 24.0985 20.6074C24.1 20.6025 24.1013 20.5975 24.1027 20.5926C24.1109 20.5644 24.1185 20.5358 24.1253 20.507C24.1276 20.4973 24.1298 20.4877 24.132 20.4779C24.1349 20.4646 24.1376 20.4512 24.1402 20.4377C24.1426 20.4252 24.1447 20.4127 24.1469 20.4002C24.1489 20.3887 24.1509 20.3772 24.1527 20.3656C24.1561 20.3425 24.159 20.3194 24.1616 20.2961C24.1625 20.2874 24.1631 20.2787 24.164 20.27C24.1657 20.2518 24.167 20.2336 24.1681 20.2152C24.1686 20.207 24.1691 20.1988 24.1695 20.1905C24.1706 20.1645 24.1715 20.1384 24.1715 20.1123C24.1718 19.1635 23.3999 18.3916 22.4511 18.3916ZM9.54882 20.7573C9.46599 20.7573 9.38698 20.7411 9.31417 20.7125L9.29001 20.7027C9.27506 20.6961 9.26033 20.6891 9.24604 20.6814C9.24433 20.6806 9.24251 20.6798 9.24081 20.6788C9.224 20.6696 9.20767 20.6596 9.19179 20.649C9.18856 20.6468 9.18544 20.6446 9.18225 20.6423C9.16933 20.6333 9.15675 20.624 9.14458 20.6141C9.14139 20.6116 9.13816 20.609 9.13505 20.6064C9.10599 20.5821 9.07916 20.5552 9.05481 20.5261C9.05177 20.5225 9.04888 20.5188 9.04591 20.5151C9.03704 20.5041 9.02858 20.4927 9.02041 20.4811C9.01722 20.4766 9.01399 20.472 9.01091 20.4674C9.00104 20.4525 8.99162 20.4373 8.98301 20.4215C8.98082 20.4176 8.979 20.4134 8.97689 20.4094C8.97054 20.3972 8.96449 20.3848 8.95896 20.3722C8.95596 20.3654 8.95313 20.3586 8.95039 20.3517C8.94594 20.3405 8.94178 20.3292 8.93792 20.3177C8.93577 20.3114 8.93347 20.3052 8.93154 20.2987C8.92642 20.2818 8.922 20.2647 8.91825 20.2472C8.91706 20.2415 8.91614 20.2357 8.9151 20.23C8.91254 20.2163 8.91042 20.2025 8.90875 20.1886C8.90805 20.1826 8.90734 20.1766 8.90679 20.1707C8.90504 20.1515 8.90382 20.1321 8.90382 20.1124C8.90382 19.7568 9.19312 19.4674 9.54878 19.4674C9.90444 19.4674 10.1937 19.7567 10.1937 20.1124C10.1937 20.4681 9.90447 20.7573 9.54882 20.7573ZM12.4899 21.9029C12.469 21.9029 12.448 21.9024 12.4273 21.9014C12.3666 21.8983 12.3071 21.8907 12.2491 21.879C12.2476 21.8787 12.246 21.8784 12.2445 21.8781C12.2289 21.8749 12.2135 21.8712 12.198 21.8674C12.1936 21.8663 12.1891 21.8654 12.1847 21.8642C12.1715 21.8608 12.1584 21.8569 12.1453 21.853C12.1387 21.8511 12.1321 21.8493 12.1255 21.8472C12.114 21.8436 12.1027 21.8396 12.0914 21.8356C12.0834 21.8328 12.0753 21.8302 12.0673 21.8272C12.0567 21.8232 12.0462 21.8189 12.0356 21.8147C12.0273 21.8113 12.019 21.808 12.0107 21.8045C11.5768 21.618 11.2721 21.1866 11.2721 20.6851C11.2721 20.0136 11.8184 19.4673 12.4899 19.4673C13.1614 19.4673 13.7077 20.0136 13.7077 20.6851C13.7077 21.3566 13.1614 21.9029 12.4899 21.9029ZM16.0013 21.9029C15.3298 21.9029 14.7835 21.3566 14.7835 20.6852C14.7835 20.0137 15.3298 19.4674 16.0013 19.4674C16.6728 19.4674 17.219 20.0137 17.219 20.6852C17.219 21.3566 16.6728 21.9029 16.0013 21.9029ZM20.0189 21.7923L20.0122 21.795L19.9981 21.801C19.8441 21.8685 19.6803 21.9027 19.5114 21.9029C18.8405 21.9023 18.2949 21.3563 18.2949 20.6852C18.2949 20.0137 18.8412 19.4674 19.5127 19.4674C20.1842 19.4674 20.7304 20.0137 20.7304 20.6852C20.7304 21.176 20.4382 21.5997 20.0189 21.7923ZM23.0931 20.1706C23.0926 20.1766 23.0919 20.1825 23.0912 20.1885C23.0895 20.2024 23.0874 20.2162 23.0848 20.2299C23.0837 20.2356 23.0829 20.2415 23.0816 20.2472C23.0779 20.2646 23.0735 20.2817 23.0684 20.2986C23.0664 20.3051 23.0641 20.3113 23.062 20.3177C23.0581 20.3292 23.054 20.3405 23.0495 20.3516C23.0468 20.3585 23.0439 20.3653 23.041 20.3721C23.0354 20.3847 23.0293 20.3972 23.023 20.4093C23.0209 20.4133 23.0191 20.4174 23.0169 20.4215C23.0083 20.4372 22.9989 20.4524 22.9891 20.4673C22.986 20.472 22.9827 20.4765 22.9795 20.481C22.9714 20.4927 22.963 20.504 22.9541 20.515C22.9511 20.5187 22.9482 20.5224 22.9452 20.5261C22.9208 20.5551 22.8939 20.5819 22.8649 20.6063C22.8618 20.609 22.8586 20.6115 22.8554 20.614C22.8432 20.6239 22.8306 20.6333 22.8178 20.6422C22.8146 20.6444 22.8114 20.6467 22.8082 20.6489C22.7923 20.6595 22.776 20.6695 22.7592 20.6787C22.7575 20.6797 22.7557 20.6805 22.754 20.6814C22.7397 20.689 22.7249 20.696 22.71 20.7026L22.6858 20.7124C22.613 20.741 22.534 20.7573 22.4512 20.7573C22.0956 20.7573 21.8063 20.4679 21.8063 20.1123C21.8063 19.7566 22.0956 19.4673 22.4512 19.4673C22.8068 19.4673 23.0962 19.7566 23.0962 20.1123C23.0961 20.132 23.0948 20.1514 23.0931 20.1706Z" fill="#202831"/>
+<path d="M22.4512 16.24H22.1936L19.7359 13.893H18.3393C18.2825 13.591 18.1769 13.3061 18.0306 13.0468L22.9532 11.0072L23.1578 11.5011L24.1981 11.0701L23.9934 10.5762L25.2352 10.0617L24.8042 9.02148L23.5624 9.5359L23.3578 9.04204L22.3176 9.473L22.5222 9.96688L17.2366 12.1569C16.7786 11.8245 16.216 11.6278 15.608 11.6278H13.5135C12.1565 11.6278 11.0243 12.6053 10.7821 13.893H9.06456V16.2701C8.05574 16.3958 7.13969 16.9114 6.5 17.7281L7.34687 18.3915C7.88236 17.7078 8.68493 17.3157 9.54888 17.3157H22.4511C23.3151 17.3157 24.1176 17.7078 24.6531 18.3915L25.5 17.7281C24.7593 16.7824 23.648 16.24 22.4512 16.24Z" fill="#202831"/>
+</g>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+<defs>
+<clipPath id="clip0_277_1733">
+<rect width="19" height="19" fill="white" transform="translate(6.5 6.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_naval_hidden.svg b/client/public/themes/olympus/images/visibility_naval_hidden.svg
new file mode 100644
index 00000000..48a521bb
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_naval_hidden.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.375 9.625C13.375 9.16016 13.7578 8.75 14.25 8.75H17.75C18.2148 8.75 18.625 9.16016 18.625 9.625V10.5H19.9375C20.6484 10.5 21.25 11.1016 21.25 11.8125V15.3125L22.4531 15.7227C23.082 15.9414 23.2461 16.7617 22.7539 17.1992L19.9922 19.7422C19.5547 19.9883 19.0625 20.1523 18.625 20.1523C18.0781 20.1523 17.5039 19.9336 16.9844 19.6055C16.3828 19.168 15.5898 19.168 14.9883 19.6055C14.5234 19.9062 13.9492 20.1523 13.3477 20.1523C12.9102 20.1523 12.418 19.9883 11.9805 19.7422L9.21875 17.1992C8.72656 16.7617 8.89062 15.9414 9.51953 15.7227L10.75 15.3125V11.8125C10.75 11.1016 11.3242 10.5 12.0625 10.5H13.375V9.625ZM12.5 14.7383L15.4258 13.7539C15.7812 13.6445 16.1914 13.6445 16.5469 13.7539L19.5 14.7383V12.25H12.5V14.7383ZM16.4922 20.2891C17.1211 20.7266 17.8594 21 18.625 21C19.3359 21 20.1289 20.7266 20.7305 20.2891C21.0586 20.0703 21.4961 20.0977 21.7969 20.3438C22.207 20.6719 22.6992 20.918 23.1914 21.0273C23.6562 21.1367 23.957 21.6016 23.8477 22.0938C23.7383 22.5586 23.2461 22.8594 22.7812 22.75C22.125 22.5859 21.5508 22.2852 21.1953 22.0664C20.4023 22.4766 19.5273 22.75 18.625 22.75C17.75 22.75 16.957 22.5039 16.4102 22.2578C16.2461 22.1758 16.1094 22.0938 16 22.0391C15.8633 22.0938 15.7266 22.1758 15.5625 22.2578C15.0156 22.5039 14.2227 22.75 13.375 22.75C12.4727 22.75 11.5703 22.4766 10.7773 22.0664C10.4219 22.2852 9.84766 22.5859 9.19141 22.75C8.72656 22.8594 8.23438 22.5586 8.125 22.0938C8.01562 21.6289 8.31641 21.1367 8.78125 21.0273C9.27344 20.918 9.79297 20.6719 10.1758 20.3438C10.4766 20.0977 10.9141 20.0703 11.2422 20.2891C11.8438 20.7266 12.6367 21 13.375 21C14.1133 21 14.8789 20.7266 15.4805 20.2891C15.7812 20.0703 16.1914 20.0703 16.4922 20.2891Z" fill="white"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_naval_visible.svg b/client/public/themes/olympus/images/visibility_naval_visible.svg
new file mode 100644
index 00000000..bfba32a8
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_naval_visible.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
+<path d="M13.375 9.625C13.375 9.16016 13.7578 8.75 14.25 8.75H17.75C18.2148 8.75 18.625 9.16016 18.625 9.625V10.5H19.9375C20.6484 10.5 21.25 11.1016 21.25 11.8125V15.3125L22.4531 15.7227C23.082 15.9414 23.2461 16.7617 22.7539 17.1992L19.9922 19.7422C19.5547 19.9883 19.0625 20.1523 18.625 20.1523C18.0781 20.1523 17.5039 19.9336 16.9844 19.6055C16.3828 19.168 15.5898 19.168 14.9883 19.6055C14.5234 19.9062 13.9492 20.1523 13.3477 20.1523C12.9102 20.1523 12.418 19.9883 11.9805 19.7422L9.21875 17.1992C8.72656 16.7617 8.89062 15.9414 9.51953 15.7227L10.75 15.3125V11.8125C10.75 11.1016 11.3242 10.5 12.0625 10.5H13.375V9.625ZM12.5 14.7383L15.4258 13.7539C15.7812 13.6445 16.1914 13.6445 16.5469 13.7539L19.5 14.7383V12.25H12.5V14.7383ZM16.4922 20.2891C17.1211 20.7266 17.8594 21 18.625 21C19.3359 21 20.1289 20.7266 20.7305 20.2891C21.0586 20.0703 21.4961 20.0977 21.7969 20.3438C22.207 20.6719 22.6992 20.918 23.1914 21.0273C23.6562 21.1367 23.957 21.6016 23.8477 22.0938C23.7383 22.5586 23.2461 22.8594 22.7812 22.75C22.125 22.5859 21.5508 22.2852 21.1953 22.0664C20.4023 22.4766 19.5273 22.75 18.625 22.75C17.75 22.75 16.957 22.5039 16.4102 22.2578C16.2461 22.1758 16.1094 22.0938 16 22.0391C15.8633 22.0938 15.7266 22.1758 15.5625 22.2578C15.0156 22.5039 14.2227 22.75 13.375 22.75C12.4727 22.75 11.5703 22.4766 10.7773 22.0664C10.4219 22.2852 9.84766 22.5859 9.19141 22.75C8.72656 22.8594 8.23438 22.5586 8.125 22.0938C8.01562 21.6289 8.31641 21.1367 8.78125 21.0273C9.27344 20.918 9.79297 20.6719 10.1758 20.3438C10.4766 20.0977 10.9141 20.0703 11.2422 20.2891C11.8438 20.7266 12.6367 21 13.375 21C14.1133 21 14.8789 20.7266 15.4805 20.2891C15.7812 20.0703 16.1914 20.0703 16.4922 20.2891Z" fill="#181E25"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_sam_hidden.svg b/client/public/themes/olympus/images/visibility_sam_hidden.svg
new file mode 100644
index 00000000..cb9d0a10
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_sam_hidden.svg
@@ -0,0 +1,18 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_277_1713)">
+<path d="M22.4511 18.3916H9.54882C8.6 18.3916 7.82812 19.1635 7.82812 20.1123C7.82812 20.1385 7.8289 20.1645 7.83013 20.1905C7.8305 20.1988 7.83098 20.207 7.83146 20.2153C7.83254 20.2336 7.83395 20.2518 7.83562 20.27C7.8364 20.2788 7.83707 20.2875 7.83803 20.2962C7.84056 20.3194 7.84345 20.3426 7.8469 20.3656C7.84865 20.3772 7.85072 20.3887 7.85269 20.4003C7.85484 20.4128 7.857 20.4253 7.85941 20.4377C7.86201 20.4512 7.86471 20.4646 7.86761 20.478C7.86972 20.4877 7.87203 20.4973 7.87433 20.507C7.88112 20.5359 7.88861 20.5644 7.89685 20.5927C7.89826 20.5976 7.8996 20.6025 7.90105 20.6074C7.90565 20.6228 7.91062 20.6379 7.91559 20.653C7.91808 20.6605 7.92064 20.668 7.9232 20.6755C7.92839 20.6903 7.93363 20.7052 7.93919 20.7199C7.94164 20.7264 7.94428 20.7327 7.94676 20.7391C7.9566 20.7642 7.96699 20.789 7.97794 20.8135C7.98228 20.8232 7.98658 20.8329 7.99111 20.8426C7.99649 20.8539 8.00198 20.8652 8.00759 20.8765C8.01364 20.8887 8.01987 20.9007 8.02622 20.9128C8.03089 20.9217 8.03557 20.9307 8.04039 20.9395C8.0519 20.9605 8.06381 20.9812 8.07616 21.0017C8.07806 21.0048 8.08002 21.0078 8.08195 21.0109C8.09394 21.0304 8.1063 21.0496 8.11903 21.0687C8.12129 21.072 8.12348 21.0753 8.12574 21.0787C8.29288 21.3247 8.52359 21.528 8.80106 21.662C8.8044 21.6636 8.80781 21.6651 8.81119 21.6667C8.8244 21.6729 8.83758 21.6793 8.85101 21.6853L8.86225 21.6898C8.89383 21.7036 8.92571 21.7168 8.95826 21.7287L11.5773 22.7895C11.5813 22.7913 11.5855 22.7927 11.5895 22.7945C11.6066 22.8018 11.6241 22.8085 11.6413 22.8154C11.6593 22.8225 11.6771 22.83 11.6952 22.8367C11.7131 22.8433 11.7313 22.8493 11.7495 22.8555C11.7677 22.8617 11.7858 22.8683 11.8042 22.8741C11.8198 22.879 11.8358 22.8832 11.8515 22.8877C11.8728 22.8939 11.894 22.9004 11.9154 22.906C11.9257 22.9086 11.9363 22.9108 11.9467 22.9133C11.9737 22.9199 12.0007 22.9265 12.028 22.9321C12.0289 22.9323 12.0298 22.9324 12.0306 22.9325C12.1748 22.962 12.322 22.9771 12.4713 22.9783C12.4775 22.9783 12.4836 22.9787 12.4897 22.9787H12.4898H19.5098C19.5103 22.9787 19.5107 22.9787 19.5111 22.9787C19.5115 22.9787 19.512 22.9787 19.5124 22.9787C19.8402 22.9787 20.1518 22.9092 20.4341 22.7847L23.0686 21.7179C23.0894 21.7099 23.1102 21.7017 23.1306 21.6928L23.1321 21.6922L23.1485 21.6853C23.1619 21.6793 23.1751 21.6729 23.1883 21.6667C23.1917 21.6651 23.1951 21.6635 23.1985 21.662C23.4759 21.528 23.7067 21.3247 23.8738 21.0787C23.876 21.0754 23.8783 21.072 23.8805 21.0687C23.8932 21.0496 23.9056 21.0304 23.9176 21.0109C23.9195 21.0078 23.9215 21.0047 23.9233 21.0017C23.9357 20.9812 23.9476 20.9604 23.9592 20.9395C23.964 20.9306 23.9687 20.9217 23.9733 20.9128C23.9797 20.9007 23.9859 20.8887 23.992 20.8765C23.9976 20.8652 24.0031 20.854 24.0084 20.8426C24.0129 20.8329 24.0173 20.8232 24.0216 20.8135C24.0326 20.789 24.043 20.7642 24.0528 20.7391C24.0553 20.7327 24.058 20.7263 24.0604 20.7199C24.066 20.7052 24.0712 20.6903 24.0764 20.6754C24.079 20.668 24.0815 20.6605 24.084 20.653C24.089 20.6378 24.094 20.6227 24.0985 20.6074C24.1 20.6025 24.1013 20.5975 24.1027 20.5926C24.1109 20.5644 24.1185 20.5358 24.1253 20.507C24.1276 20.4973 24.1298 20.4877 24.132 20.4779C24.1349 20.4646 24.1376 20.4512 24.1402 20.4377C24.1426 20.4252 24.1447 20.4127 24.1469 20.4002C24.1489 20.3887 24.1509 20.3772 24.1527 20.3656C24.1561 20.3425 24.159 20.3194 24.1616 20.2961C24.1625 20.2874 24.1631 20.2787 24.164 20.27C24.1657 20.2518 24.167 20.2336 24.1681 20.2152C24.1686 20.207 24.1691 20.1988 24.1695 20.1905C24.1706 20.1645 24.1715 20.1384 24.1715 20.1123C24.1718 19.1635 23.3999 18.3916 22.4511 18.3916ZM9.54882 20.7573C9.46599 20.7573 9.38698 20.7411 9.31417 20.7125L9.29001 20.7027C9.27506 20.6961 9.26033 20.6891 9.24604 20.6814C9.24433 20.6806 9.24251 20.6798 9.24081 20.6788C9.224 20.6696 9.20767 20.6596 9.19179 20.649C9.18856 20.6468 9.18544 20.6446 9.18225 20.6423C9.16933 20.6333 9.15675 20.624 9.14458 20.6141C9.14139 20.6116 9.13816 20.609 9.13505 20.6064C9.10599 20.5821 9.07916 20.5552 9.05481 20.5261C9.05177 20.5225 9.04888 20.5188 9.04591 20.5151C9.03704 20.5041 9.02858 20.4927 9.02041 20.4811C9.01722 20.4766 9.01399 20.472 9.01091 20.4674C9.00104 20.4525 8.99162 20.4373 8.98301 20.4215C8.98082 20.4176 8.979 20.4134 8.97689 20.4094C8.97054 20.3972 8.96449 20.3848 8.95896 20.3722C8.95596 20.3654 8.95313 20.3586 8.95039 20.3517C8.94594 20.3405 8.94178 20.3292 8.93792 20.3177C8.93577 20.3114 8.93347 20.3052 8.93154 20.2987C8.92642 20.2818 8.922 20.2647 8.91825 20.2472C8.91706 20.2415 8.91614 20.2357 8.9151 20.23C8.91254 20.2163 8.91042 20.2025 8.90875 20.1886C8.90805 20.1826 8.90734 20.1766 8.90679 20.1707C8.90504 20.1515 8.90382 20.1321 8.90382 20.1124C8.90382 19.7568 9.19312 19.4674 9.54878 19.4674C9.90444 19.4674 10.1937 19.7567 10.1937 20.1124C10.1937 20.4681 9.90447 20.7573 9.54882 20.7573ZM12.4899 21.9029C12.469 21.9029 12.448 21.9024 12.4273 21.9014C12.3666 21.8983 12.3071 21.8907 12.2491 21.879C12.2476 21.8787 12.246 21.8784 12.2445 21.8781C12.2289 21.8749 12.2135 21.8712 12.198 21.8674C12.1936 21.8663 12.1891 21.8654 12.1847 21.8642C12.1715 21.8608 12.1584 21.8569 12.1453 21.853C12.1387 21.8511 12.1321 21.8493 12.1255 21.8472C12.114 21.8436 12.1027 21.8396 12.0914 21.8356C12.0834 21.8328 12.0753 21.8302 12.0673 21.8272C12.0567 21.8232 12.0462 21.8189 12.0356 21.8147C12.0273 21.8113 12.019 21.808 12.0107 21.8045C11.5768 21.618 11.2721 21.1866 11.2721 20.6851C11.2721 20.0136 11.8184 19.4673 12.4899 19.4673C13.1614 19.4673 13.7077 20.0136 13.7077 20.6851C13.7077 21.3566 13.1614 21.9029 12.4899 21.9029ZM16.0013 21.9029C15.3298 21.9029 14.7835 21.3566 14.7835 20.6852C14.7835 20.0137 15.3298 19.4674 16.0013 19.4674C16.6728 19.4674 17.219 20.0137 17.219 20.6852C17.219 21.3566 16.6728 21.9029 16.0013 21.9029ZM20.0189 21.7923L20.0122 21.795L19.9981 21.801C19.8441 21.8685 19.6803 21.9027 19.5114 21.9029C18.8405 21.9023 18.2949 21.3563 18.2949 20.6852C18.2949 20.0137 18.8412 19.4674 19.5127 19.4674C20.1842 19.4674 20.7304 20.0137 20.7304 20.6852C20.7304 21.176 20.4382 21.5997 20.0189 21.7923ZM23.0931 20.1706C23.0926 20.1766 23.0919 20.1825 23.0912 20.1885C23.0895 20.2024 23.0874 20.2162 23.0848 20.2299C23.0837 20.2356 23.0829 20.2415 23.0816 20.2472C23.0779 20.2646 23.0735 20.2817 23.0684 20.2986C23.0664 20.3051 23.0641 20.3113 23.062 20.3177C23.0581 20.3292 23.054 20.3405 23.0495 20.3516C23.0468 20.3585 23.0439 20.3653 23.041 20.3721C23.0354 20.3847 23.0293 20.3972 23.023 20.4093C23.0209 20.4133 23.0191 20.4174 23.0169 20.4215C23.0083 20.4372 22.9989 20.4524 22.9891 20.4673C22.986 20.472 22.9827 20.4765 22.9795 20.481C22.9714 20.4927 22.963 20.504 22.9541 20.515C22.9511 20.5187 22.9482 20.5224 22.9452 20.5261C22.9208 20.5551 22.8939 20.5819 22.8649 20.6063C22.8618 20.609 22.8586 20.6115 22.8554 20.614C22.8432 20.6239 22.8306 20.6333 22.8178 20.6422C22.8146 20.6444 22.8114 20.6467 22.8082 20.6489C22.7923 20.6595 22.776 20.6695 22.7592 20.6787C22.7575 20.6797 22.7557 20.6805 22.754 20.6814C22.7397 20.689 22.7249 20.696 22.71 20.7026L22.6858 20.7124C22.613 20.741 22.534 20.7573 22.4512 20.7573C22.0956 20.7573 21.8063 20.4679 21.8063 20.1123C21.8063 19.7566 22.0956 19.4673 22.4512 19.4673C22.8068 19.4673 23.0962 19.7566 23.0962 20.1123C23.0961 20.132 23.0948 20.1514 23.0931 20.1706Z" fill="white"/>
+<path d="M22.4512 16.2401H22.1936L19.7359 13.8931H18.3393C18.2825 13.591 18.1463 14.2593 18 14L17.5 15L18.3393 13.8931L17.5 13.893L15 15.0001L16 15.5001L15.6257 14.723L15 15.0001L17.5 13.893C16.6501 13.8928 16.108 13.8929 15.5 13.8929L13.5 13.893C12.1431 13.893 12.5 13.893 10.7821 13.893H9.06456V16.2702C8.05574 16.3958 7.13969 16.9115 6.5 17.7282L7.34687 18.3915C7.88236 17.7079 8.68493 17.3158 9.54888 17.3158H22.4511C23.3151 17.3158 24.1176 17.7079 24.6531 18.3915L25.5 17.7282C24.7593 16.7825 23.648 16.2401 22.4512 16.2401Z" fill="white"/>
+</g>
+<g clip-path="url(#clip1_277_1713)">
+<path d="M10.0072 10.1775L10.3123 10.0351L10.1175 8.80853L11.0387 8.66225L11.8662 9.4227L13.4481 9.1715L13.2636 8.00948C13.239 7.85454 13.2781 7.71959 13.3506 7.70807L15.3812 8.86439L18.0682 8.4377C18.0997 8.4327 18.131 8.42836 18.1622 8.42395L18.4466 10.215C18.4155 10.2204 18.3844 10.226 18.3529 10.231L15.5598 10.6745L14.0937 12.3862C14.021 12.3978 13.9423 12.2815 13.9176 12.1263L13.7331 10.9646L12.2499 11.2001L11.6205 12.3258L10.6993 12.472L10.4813 11.0993L10.1465 11.0544C9.8594 10.6341 10.0072 10.1775 10.0072 10.1775ZM20.5299 8.96609C20.4589 8.51896 19.601 8.27526 18.5452 8.37328L18.8265 10.1441C19.8605 9.91034 20.6009 9.41313 20.5299 8.96609Z" fill="white"/>
+</g>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+<defs>
+<clipPath id="clip0_277_1713">
+<rect width="19" height="19" fill="white" transform="translate(6.5 6.5)"/>
+</clipPath>
+<clipPath id="clip1_277_1713">
+<rect width="12.7515" height="12.7515" fill="white" transform="translate(20.7207 16.1128) rotate(-175.986)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_sam_visible.svg b/client/public/themes/olympus/images/visibility_sam_visible.svg
new file mode 100644
index 00000000..4beca510
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_sam_visible.svg
@@ -0,0 +1,19 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
+<g clip-path="url(#clip0_277_1741)">
+<path d="M22.4511 18.3916H9.54882C8.6 18.3916 7.82812 19.1635 7.82812 20.1123C7.82812 20.1385 7.8289 20.1645 7.83013 20.1905C7.8305 20.1988 7.83098 20.207 7.83146 20.2153C7.83254 20.2336 7.83395 20.2518 7.83562 20.27C7.8364 20.2788 7.83707 20.2875 7.83803 20.2962C7.84056 20.3194 7.84345 20.3426 7.8469 20.3656C7.84865 20.3772 7.85072 20.3887 7.85269 20.4003C7.85484 20.4128 7.857 20.4253 7.85941 20.4377C7.86201 20.4512 7.86471 20.4646 7.86761 20.478C7.86972 20.4877 7.87203 20.4973 7.87433 20.507C7.88112 20.5359 7.88861 20.5644 7.89685 20.5927C7.89826 20.5976 7.8996 20.6025 7.90105 20.6074C7.90565 20.6228 7.91062 20.6379 7.91559 20.653C7.91808 20.6605 7.92064 20.668 7.9232 20.6755C7.92839 20.6903 7.93363 20.7052 7.93919 20.7199C7.94164 20.7264 7.94428 20.7327 7.94676 20.7391C7.9566 20.7642 7.96699 20.789 7.97794 20.8135C7.98228 20.8232 7.98658 20.8329 7.99111 20.8426C7.99649 20.8539 8.00198 20.8652 8.00759 20.8765C8.01364 20.8887 8.01987 20.9007 8.02622 20.9128C8.03089 20.9217 8.03557 20.9307 8.04039 20.9395C8.0519 20.9605 8.06381 20.9812 8.07616 21.0017C8.07806 21.0048 8.08002 21.0078 8.08195 21.0109C8.09394 21.0304 8.1063 21.0496 8.11903 21.0687C8.12129 21.072 8.12348 21.0753 8.12574 21.0787C8.29288 21.3247 8.52359 21.528 8.80106 21.662C8.8044 21.6636 8.80781 21.6651 8.81119 21.6667C8.8244 21.6729 8.83758 21.6793 8.85101 21.6853L8.86225 21.6898C8.89383 21.7036 8.92571 21.7168 8.95826 21.7287L11.5773 22.7895C11.5813 22.7913 11.5855 22.7927 11.5895 22.7945C11.6066 22.8018 11.6241 22.8085 11.6413 22.8154C11.6593 22.8225 11.6771 22.83 11.6952 22.8367C11.7131 22.8433 11.7313 22.8493 11.7495 22.8555C11.7677 22.8617 11.7858 22.8683 11.8042 22.8741C11.8198 22.879 11.8358 22.8832 11.8515 22.8877C11.8728 22.8939 11.894 22.9004 11.9154 22.906C11.9257 22.9086 11.9363 22.9108 11.9467 22.9133C11.9737 22.9199 12.0007 22.9265 12.028 22.9321C12.0289 22.9323 12.0298 22.9324 12.0306 22.9325C12.1748 22.962 12.322 22.9771 12.4713 22.9783C12.4775 22.9783 12.4836 22.9787 12.4897 22.9787H12.4898H19.5098C19.5103 22.9787 19.5107 22.9787 19.5111 22.9787C19.5115 22.9787 19.512 22.9787 19.5124 22.9787C19.8402 22.9787 20.1518 22.9092 20.4341 22.7847L23.0686 21.7179C23.0894 21.7099 23.1102 21.7017 23.1306 21.6928L23.1321 21.6922L23.1485 21.6853C23.1619 21.6793 23.1751 21.6729 23.1883 21.6667C23.1917 21.6651 23.1951 21.6635 23.1985 21.662C23.4759 21.528 23.7067 21.3247 23.8738 21.0787C23.876 21.0754 23.8783 21.072 23.8805 21.0687C23.8932 21.0496 23.9056 21.0304 23.9176 21.0109C23.9195 21.0078 23.9215 21.0047 23.9233 21.0017C23.9357 20.9812 23.9476 20.9604 23.9592 20.9395C23.964 20.9306 23.9687 20.9217 23.9733 20.9128C23.9797 20.9007 23.9859 20.8887 23.992 20.8765C23.9976 20.8652 24.0031 20.854 24.0084 20.8426C24.0129 20.8329 24.0173 20.8232 24.0216 20.8135C24.0326 20.789 24.043 20.7642 24.0528 20.7391C24.0553 20.7327 24.058 20.7263 24.0604 20.7199C24.066 20.7052 24.0712 20.6903 24.0764 20.6754C24.079 20.668 24.0815 20.6605 24.084 20.653C24.089 20.6378 24.094 20.6227 24.0985 20.6074C24.1 20.6025 24.1013 20.5975 24.1027 20.5926C24.1109 20.5644 24.1185 20.5358 24.1253 20.507C24.1276 20.4973 24.1298 20.4877 24.132 20.4779C24.1349 20.4646 24.1376 20.4512 24.1402 20.4377C24.1426 20.4252 24.1447 20.4127 24.1469 20.4002C24.1489 20.3887 24.1509 20.3772 24.1527 20.3656C24.1561 20.3425 24.159 20.3194 24.1616 20.2961C24.1625 20.2874 24.1631 20.2787 24.164 20.27C24.1657 20.2518 24.167 20.2336 24.1681 20.2152C24.1686 20.207 24.1691 20.1988 24.1695 20.1905C24.1706 20.1645 24.1715 20.1384 24.1715 20.1123C24.1718 19.1635 23.3999 18.3916 22.4511 18.3916ZM9.54882 20.7573C9.46599 20.7573 9.38698 20.7411 9.31417 20.7125L9.29001 20.7027C9.27506 20.6961 9.26033 20.6891 9.24604 20.6814C9.24433 20.6806 9.24251 20.6798 9.24081 20.6788C9.224 20.6696 9.20767 20.6596 9.19179 20.649C9.18856 20.6468 9.18544 20.6446 9.18225 20.6423C9.16933 20.6333 9.15675 20.624 9.14458 20.6141C9.14139 20.6116 9.13816 20.609 9.13505 20.6064C9.10599 20.5821 9.07916 20.5552 9.05481 20.5261C9.05177 20.5225 9.04888 20.5188 9.04591 20.5151C9.03704 20.5041 9.02858 20.4927 9.02041 20.4811C9.01722 20.4766 9.01399 20.472 9.01091 20.4674C9.00104 20.4525 8.99162 20.4373 8.98301 20.4215C8.98082 20.4176 8.979 20.4134 8.97689 20.4094C8.97054 20.3972 8.96449 20.3848 8.95896 20.3722C8.95596 20.3654 8.95313 20.3586 8.95039 20.3517C8.94594 20.3405 8.94178 20.3292 8.93792 20.3177C8.93577 20.3114 8.93347 20.3052 8.93154 20.2987C8.92642 20.2818 8.922 20.2647 8.91825 20.2472C8.91706 20.2415 8.91614 20.2357 8.9151 20.23C8.91254 20.2163 8.91042 20.2025 8.90875 20.1886C8.90805 20.1826 8.90734 20.1766 8.90679 20.1707C8.90504 20.1515 8.90382 20.1321 8.90382 20.1124C8.90382 19.7568 9.19312 19.4674 9.54878 19.4674C9.90444 19.4674 10.1937 19.7567 10.1937 20.1124C10.1937 20.4681 9.90447 20.7573 9.54882 20.7573ZM12.4899 21.9029C12.469 21.9029 12.448 21.9024 12.4273 21.9014C12.3666 21.8983 12.3071 21.8907 12.2491 21.879C12.2476 21.8787 12.246 21.8784 12.2445 21.8781C12.2289 21.8749 12.2135 21.8712 12.198 21.8674C12.1936 21.8663 12.1891 21.8654 12.1847 21.8642C12.1715 21.8608 12.1584 21.8569 12.1453 21.853C12.1387 21.8511 12.1321 21.8493 12.1255 21.8472C12.114 21.8436 12.1027 21.8396 12.0914 21.8356C12.0834 21.8328 12.0753 21.8302 12.0673 21.8272C12.0567 21.8232 12.0462 21.8189 12.0356 21.8147C12.0273 21.8113 12.019 21.808 12.0107 21.8045C11.5768 21.618 11.2721 21.1866 11.2721 20.6851C11.2721 20.0136 11.8184 19.4673 12.4899 19.4673C13.1614 19.4673 13.7077 20.0136 13.7077 20.6851C13.7077 21.3566 13.1614 21.9029 12.4899 21.9029ZM16.0013 21.9029C15.3298 21.9029 14.7835 21.3566 14.7835 20.6852C14.7835 20.0137 15.3298 19.4674 16.0013 19.4674C16.6728 19.4674 17.219 20.0137 17.219 20.6852C17.219 21.3566 16.6728 21.9029 16.0013 21.9029ZM20.0189 21.7923L20.0122 21.795L19.9981 21.801C19.8441 21.8685 19.6803 21.9027 19.5114 21.9029C18.8405 21.9023 18.2949 21.3563 18.2949 20.6852C18.2949 20.0137 18.8412 19.4674 19.5127 19.4674C20.1842 19.4674 20.7304 20.0137 20.7304 20.6852C20.7304 21.176 20.4382 21.5997 20.0189 21.7923ZM23.0931 20.1706C23.0926 20.1766 23.0919 20.1825 23.0912 20.1885C23.0895 20.2024 23.0874 20.2162 23.0848 20.2299C23.0837 20.2356 23.0829 20.2415 23.0816 20.2472C23.0779 20.2646 23.0735 20.2817 23.0684 20.2986C23.0664 20.3051 23.0641 20.3113 23.062 20.3177C23.0581 20.3292 23.054 20.3405 23.0495 20.3516C23.0468 20.3585 23.0439 20.3653 23.041 20.3721C23.0354 20.3847 23.0293 20.3972 23.023 20.4093C23.0209 20.4133 23.0191 20.4174 23.0169 20.4215C23.0083 20.4372 22.9989 20.4524 22.9891 20.4673C22.986 20.472 22.9827 20.4765 22.9795 20.481C22.9714 20.4927 22.963 20.504 22.9541 20.515C22.9511 20.5187 22.9482 20.5224 22.9452 20.5261C22.9208 20.5551 22.8939 20.5819 22.8649 20.6063C22.8618 20.609 22.8586 20.6115 22.8554 20.614C22.8432 20.6239 22.8306 20.6333 22.8178 20.6422C22.8146 20.6444 22.8114 20.6467 22.8082 20.6489C22.7923 20.6595 22.776 20.6695 22.7592 20.6787C22.7575 20.6797 22.7557 20.6805 22.754 20.6814C22.7397 20.689 22.7249 20.696 22.71 20.7026L22.6858 20.7124C22.613 20.741 22.534 20.7573 22.4512 20.7573C22.0956 20.7573 21.8063 20.4679 21.8063 20.1123C21.8063 19.7566 22.0956 19.4673 22.4512 19.4673C22.8068 19.4673 23.0962 19.7566 23.0962 20.1123C23.0961 20.132 23.0948 20.1514 23.0931 20.1706Z" fill="#202831"/>
+<path d="M22.4512 16.2401H22.1936L19.7359 13.8931H18.3393C18.2825 13.591 18.1463 14.2593 18 14L17.5 15L18.3393 13.8931L17.5 13.893L15 15.0001L16 15.5001L15.6257 14.723L15 15.0001L17.5 13.893C16.6501 13.8928 16.108 13.8929 15.5 13.8929L13.5 13.893C12.1431 13.893 12.5 13.893 10.7821 13.893H9.06456V16.2702C8.05574 16.3958 7.13969 16.9115 6.5 17.7282L7.34687 18.3915C7.88236 17.7079 8.68493 17.3158 9.54888 17.3158H22.4511C23.3151 17.3158 24.1176 17.7079 24.6531 18.3915L25.5 17.7282C24.7593 16.7825 23.648 16.2401 22.4512 16.2401Z" fill="#202831"/>
+</g>
+<g clip-path="url(#clip1_277_1741)">
+<path d="M10.0072 10.1775L10.3123 10.0351L10.1175 8.80853L11.0387 8.66225L11.8662 9.4227L13.4481 9.1715L13.2636 8.00948C13.239 7.85454 13.2781 7.71959 13.3506 7.70807L15.3812 8.86439L18.0682 8.4377C18.0997 8.4327 18.131 8.42836 18.1622 8.42395L18.4466 10.215C18.4155 10.2204 18.3844 10.226 18.3529 10.231L15.5598 10.6745L14.0937 12.3862C14.021 12.3978 13.9423 12.2815 13.9176 12.1263L13.7331 10.9646L12.2499 11.2001L11.6205 12.3258L10.6993 12.472L10.4813 11.0993L10.1465 11.0544C9.8594 10.6341 10.0072 10.1775 10.0072 10.1775ZM20.5299 8.96609C20.4589 8.51896 19.601 8.27526 18.5452 8.37328L18.8265 10.1441C19.8605 9.91034 20.6009 9.41313 20.5299 8.96609Z" fill="#202831"/>
+</g>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+<defs>
+<clipPath id="clip0_277_1741">
+<rect width="19" height="19" fill="white" transform="translate(6.5 6.5)"/>
+</clipPath>
+<clipPath id="clip1_277_1741">
+<rect width="12.7515" height="12.7515" fill="white" transform="translate(20.7207 16.1128) rotate(-175.986)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_threat_hidden.svg b/client/public/themes/olympus/images/visibility_threat_hidden.svg
new file mode 100644
index 00000000..2fb993f1
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_threat_hidden.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.375 15.75C13.375 14.3008 14.5234 13.125 16 13.125C17.4492 13.125 18.625 14.3008 18.625 15.75C18.625 17.1992 17.4492 18.375 16 18.375C14.5234 18.375 13.375 17.1992 13.375 15.75ZM23 15.75C23 19.6328 19.8555 22.75 16 22.75C12.1172 22.75 9 19.6328 9 15.75C9 11.8945 12.1172 8.75 16 8.75C19.8555 8.75 23 11.8945 23 15.75ZM16 10.0625C12.8555 10.0625 10.3125 12.6328 10.3125 15.75C10.3125 18.8945 12.8555 21.4375 16 21.4375C19.1172 21.4375 21.6875 18.8945 21.6875 15.75C21.6875 12.6328 19.1172 10.0625 16 10.0625Z" fill="white"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/images/visibility_threat_visible.svg b/client/public/themes/olympus/images/visibility_threat_visible.svg
new file mode 100644
index 00000000..6a5580de
--- /dev/null
+++ b/client/public/themes/olympus/images/visibility_threat_visible.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white"/>
+<path d="M13.375 15.75C13.375 14.3008 14.5234 13.125 16 13.125C17.4492 13.125 18.625 14.3008 18.625 15.75C18.625 17.1992 17.4492 18.375 16 18.375C14.5234 18.375 13.375 17.1992 13.375 15.75ZM23 15.75C23 19.6328 19.8555 22.75 16 22.75C12.1172 22.75 9 19.6328 9 15.75C9 11.8945 12.1172 8.75 16 8.75C19.8555 8.75 23 11.8945 23 15.75ZM16 10.0625C12.8555 10.0625 10.3125 12.6328 10.3125 15.75C10.3125 18.8945 12.8555 21.4375 16 21.4375C19.1172 21.4375 21.6875 18.8945 21.6875 15.75C21.6875 12.6328 19.1172 10.0625 16 10.0625Z" fill="#181E25"/>
+<rect x="0.5" y="0.5" width="31" height="31" rx="7.5" stroke="white"/>
+</svg>
diff --git a/client/public/themes/olympus/olympus.css b/client/public/themes/olympus/olympus.css
index 0e17e093..5d31045c 100644
--- a/client/public/themes/olympus/olympus.css
+++ b/client/public/themes/olympus/olympus.css
@@ -45,6 +45,25 @@
 
 
 
+    /***  Navbar  ***/
+
+    --visibility-control-aircraft-visible-url: url( "/themes/olympus/images/visibility_aircraft_visible.svg" );
+    --visibility-control-aircraft-hidden-url: url( "/themes/olympus/images/visibility_aircraft_hidden.svg" );
+
+    --visibility-control-ground-visible-url: url( "/themes/olympus/images/visibility_ground_visible.svg" );
+    --visibility-control-ground-hidden-url: url( "/themes/olympus/images/visibility_ground_hidden.svg" );
+
+    --visibility-control-sam-visible-url: url( "/themes/olympus/images/visibility_sam_visible.svg" );
+    --visibility-control-sam-hidden-url: url( "/themes/olympus/images/visibility_sam_hidden.svg" );
+
+    --visibility-control-naval-visible-url: url( "/themes/olympus/images/visibility_naval_visible.svg" );
+    --visibility-control-naval-hidden-url: url( "/themes/olympus/images/visibility_naval_hidden.svg" );
+
+    --visibility-control-threat-visible-url: url( "/themes/olympus/images/visibility_threat_visible.svg" );
+    --visibility-control-threat-hidden-url: url( "/themes/olympus/images/visibility_threat_hidden.svg" );
+
+
+
     /***  Unit marker settings  ***/
 
 
diff --git a/client/views/navbar.ejs b/client/views/navbar.ejs
index 92569e0e..1953644e 100644
--- a/client/views/navbar.ejs
+++ b/client/views/navbar.ejs
@@ -44,7 +44,12 @@
     </div>
 
     <div id="map-type" class="ol-select">
-        <div class="ol-select-value">ArcGIS Satellite</div>
+        <div class="ol-select-value">
+            <svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M11.1562 3.53125C11.1562 5.03516 9.13281 7.6875 8.25781 8.78125C8.06641 9.05469 7.65625 9.05469 7.46484 8.78125C6.58984 7.6875 4.59375 5.03516 4.59375 3.53125C4.59375 1.72656 6.04297 0.25 7.875 0.25C9.67969 0.25 11.1562 1.72656 11.1562 3.53125ZM11.375 5.74609C11.457 5.55469 11.5391 5.36328 11.6211 5.17188C11.6484 5.14453 11.6484 5.11719 11.6758 5.08984L14.8477 3.80469C15.2578 3.64062 15.75 3.94141 15.75 4.40625V11.8164C15.75 12.0898 15.5859 12.3359 15.3125 12.4453L11.375 14.0039V5.74609ZM3.74609 4.05078C3.82812 4.43359 3.9375 4.81641 4.10156 5.17188C4.18359 5.36328 4.26562 5.55469 4.375 5.74609V12.6094L0.875 14.0039C0.464844 14.168 0 13.8672 0 13.4023V5.99219C0 5.71875 0.164062 5.47266 0.410156 5.39062L3.74609 4.05078ZM8.94141 9.32812C9.32422 8.86328 9.92578 8.09766 10.5 7.22266V14.0586L5.25 12.5547V7.22266C5.79688 8.09766 6.39844 8.86328 6.78125 9.32812C7.32812 10.0391 8.39453 10.0391 8.94141 9.32812ZM7.875 4.40625C8.47656 4.40625 8.96875 3.94141 8.96875 3.3125C8.96875 2.71094 8.47656 2.21875 7.875 2.21875C7.24609 2.21875 6.78125 2.71094 6.78125 3.3125C6.78125 3.94141 7.24609 4.40625 7.875 4.40625Z" fill="white"/>
+            </svg>
+            <span>ArcGIS Satellite</span>
+        </div>
         <div class="ol-select-options">
             <div>
                 <button>ArcGIS Satellite</button>
@@ -66,28 +71,13 @@
             </div>
         </div>
     </div>
-
-    <div class="ol-select">
-        <div class="ol-select-value">Caucasus</div>
-        <div class="ol-select-options">
-            <div>
-                <button>Caucasus</button>
-            </div>
-            <div>
-                <button>Nevada</button>
-            </div>
-            <div>
-                <button>Syria</button>
-            </div>
-        </div>
-    </div>
     
-    <div class="ol-group">
-        <button title="Toggle planes visibility">P</button>
-        <button title="Toggle vehicle visibility">G</button>
-        <button title="Toggle SAM visibility">S</button>
-        <button title="Toggle navy visibility">N</button>
-        <button title="Toggle threat ring visibility">T</button>
+    <div id="visibility-control" class="ol-group">
+        <button id="visibility-control-aircraft" title="Toggle aircraft' visibility (a) [no function]"></button>
+        <button id="visibility-control-ground" title="Toggle ground units' visibility (g) [no function]"></button>
+        <button id="visibility-control-sam" title="Toggle SAMs' visibility (s) [no function]"></button>
+        <button id="visibility-control-naval" title="Toggle naval visibility (n) [no function]"></button>
+        <button id="visibility-control-threat" title="Toggle threat rings' visibility (t) [no function]"></button>
     </div>
 
     <div class="ol-group ol-group-checkbox">