diff --git a/client/public/themes/olympus/olympus.css b/client/public/themes/olympus/olympus.css
index 97943357..eddf9b2b 100644
--- a/client/public/themes/olympus/olympus.css
+++ b/client/public/themes/olympus/olympus.css
@@ -96,16 +96,16 @@
     --unit-air-vvi-width: 4px;
     --unit-air-width: var( --unit-air-height );
 
-    --unit-air-marker-height: 34px;
-    --unit-air-marker-width: 34px;
+    --unit-air-marker-height: 36px;
+    --unit-air-marker-width: 36px;
 
     --unit-air-marker-blue-url: url( "/themes/olympus/images/icon_aircraft_blue.svg" );
     --unit-air-marker-blue-hover-url: url( "/themes/olympus/images/icon_aircraft_blue_hover.svg" );
     
-    --unit-air-marker-neutral-url: url( "data:image/svg+xml,%3Csvg width='50' height='38' viewBox='0 0 50 38' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.08142 36.5L25 2L44.9186 36.5H5.08142Z' fill='%23CFD9E8' stroke='%232F2F2F' stroke-width='2'/%3E%3C/svg%3E" );
+    --unit-air-marker-neutral-url: url( "/themes/olympus/images/icon_aircraft_neutral.svg" );
     --unit-air-marker-neutral-hover-url: url( "/themes/olympus/images/icon_aircraft_neutral_hover.svg" );
     
-    --unit-air-marker-red-url: url( "data:image/svg+xml,%3Csvg width='50' height='38' viewBox='0 0 50 38' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.08142 36.5L25 2L44.9186 36.5H5.08142Z' fill='%23FF5858' stroke='%23262222' stroke-width='2'/%3E%3C/svg%3E" );
+    --unit-air-marker-red-url: url( "/themes/olympus/images/icon_aircraft_red.svg" );
     --unit-air-marker-red-hover-url: url( "/themes/olympus/images/icon_aircraft_red_hover.svg" );
 
 
diff --git a/client/views/uikit.ejs b/client/views/uikit.ejs
index 47ec6677..b0a02550 100644
--- a/client/views/uikit.ejs
+++ b/client/views/uikit.ejs
@@ -170,7 +170,6 @@
                             
                             <div class="unit unit-ground" data-coalition="">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">Z</div>
                             </div>
@@ -183,7 +182,6 @@
                             
                             <div class="unit unit-ground" data-coalition="blue">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">Y</div>
                             </div>
@@ -196,7 +194,6 @@
                             
                             <div class="unit unit-ground" data-coalition="red">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">X</div>
                             </div>
@@ -219,7 +216,6 @@
                             
                             <div class="unit unit-sam" data-coalition="">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">Z</div>
                             </div>
@@ -232,7 +228,6 @@
                             
                             <div class="unit unit-sam" data-coalition="blue">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">Y</div>
                             </div>
@@ -245,7 +240,6 @@
                             
                             <div class="unit unit-sam" data-coalition="red">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-marker"></div>
                                 <div class="unit-short-label">X</div>
                             </div>
@@ -272,7 +266,6 @@
 
                             <div class="unit unit-air">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -297,7 +290,6 @@
 
                             <div class="unit unit-air" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -322,7 +314,6 @@
 
                             <div class="unit unit-air" data-coalition="blue">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -347,7 +338,6 @@
 
                             <div class="unit unit-air" data-coalition="blue" data-is-selected="true" data-has-fox-1="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -374,7 +364,6 @@
                 
                             <div class="unit unit-air" data-coalition="red">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -401,7 +390,6 @@
                 
                             <div class="unit unit-air" data-coalition="red" data-is-selected="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -437,7 +425,6 @@
                             <div class="caption">Neutral</div>
                             <div class="unit unit-air" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -462,7 +449,6 @@
                             
                             <div class="unit unit-air" data-is-selected="true" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -487,7 +473,6 @@
 
                             <div class="unit unit-air" data-coalition="blue" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -512,7 +497,6 @@
 
                             <div class="unit unit-air" data-coalition="blue" data-is-selected="true" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -537,7 +521,6 @@
 
                             <div class="unit unit-air" data-coalition="red" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -562,7 +545,6 @@
 
                             <div class="unit unit-air" data-coalition="red" data-is-selected="true" data-is-in-hotgroup="true" data-has-fox-1="true" data-has-fox-2="true" data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -595,7 +577,6 @@
                             <div class="caption">0% (empty)</div>
                             <div class="unit unit-air" data-pilot="ai" data-has-low-fuel="true" data-coalition="red" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -620,7 +601,6 @@
                             
                             <div class="unit unit-air" data-pilot="ai" data-has-low-fuel="true" data-coalition="red" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -644,7 +624,6 @@
                             <div class="caption">20%</div>
                             <div class="unit unit-air" data-pilot="ai" data-has-low-fuel="true" data-coalition="red">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -668,7 +647,6 @@
                             <div class="caption">50%</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -692,7 +670,6 @@
                             <div class="caption">75%</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -716,7 +693,6 @@
                             <div class="caption">100%</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -749,7 +725,6 @@
                             <div class="caption">Neutral</div>
                             <div class="unit unit-air" data-pilot="ai" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -773,7 +748,6 @@
                             <div class="caption">Neutral</div>
                             <div class="unit unit-air" data-pilot="ai" data-is-selected="true" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -797,7 +771,6 @@
                             <div class="caption">Blue</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="blue" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -821,7 +794,6 @@
                             <div class="caption">Blue</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="blue" data-is-selected="true" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -845,7 +817,6 @@
                             <div class="caption">Red</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -869,7 +840,6 @@
                             <div class="caption">Red</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-selected="true" data-has-fox-1="true"  data-has-fox-2="true"  data-has-fox-3="true" data-has-other-ammo="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
                                 </div>
@@ -902,7 +872,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(0deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">1</div>
@@ -927,7 +896,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 80px; transform:rotate(45deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">2</div>
@@ -952,7 +920,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(90deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">3</div>
@@ -977,7 +944,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1002,7 +968,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(180deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">5</div>
@@ -1027,7 +992,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 20px; transform:rotate(272deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">5</div>
@@ -1063,7 +1027,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="blue">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 30px; transform:rotate(90deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1094,7 +1057,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1125,7 +1087,6 @@
                             <div class="caption">&nbsp;</div>
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1163,7 +1124,6 @@
                             
                             <div class="unit unit-air" data-status="rtb" data-pilot="ai">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1194,7 +1154,6 @@
                             
                             <div class="unit unit-air" data-status="rtb" data-coalition="blue" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(315deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1224,7 +1183,6 @@
                             
                             <div class="unit unit-air" data-status="rtb" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(270deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1255,7 +1213,6 @@
                             
                             <div class="unit unit-air" data-status="hold" data-pilot="ai">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1286,7 +1243,6 @@
                             
                             <div class="unit unit-air" data-status="hold" data-coalition="blue" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(315deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1316,7 +1272,6 @@
                             
                             <div class="unit unit-air" data-status="hold" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-status"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(280deg);"></div>
                                 <div class="unit-hotgroup">
@@ -1355,7 +1310,6 @@
 
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1380,7 +1334,6 @@
 
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1418,7 +1371,6 @@
 
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>
@@ -1443,7 +1395,6 @@
 
                             <div class="unit unit-air" data-pilot="ai" data-coalition="red" data-is-in-hotgroup="true" data-is-selected="true">
                                 <div class="unit-selected-spotlight"></div>
-                                <div class="unit-marker-border"></div>
                                 <div class="unit-vvi" style="height: 50px; transform:rotate(135deg);"></div>
                                 <div class="unit-hotgroup">
                                     <div class="unit-hotgroup-id">4</div>