diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index 02b41a03..013a8290 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -666,101 +666,93 @@ body[data-hide-navyunit] #unit-visibility-control-navyunit {
 }
 
 #roe-buttons-container button::before, #reaction-to-threat-buttons-container button::before {
+    background-position:center;
     background-repeat: no-repeat;
-    background-size:16px 16px;
     content: "";
     display:block;
-    height:16px;
-    width:16px;
+    height:24px;
+    width:24px;
 }
 
 
 
-#roe-buttons-container button[title="Free"]::before {
-    background-image: url( "/themes/olympus/images/icons_roe_free_light.svg");
-}
 
-#roe-buttons-container button[title="Designated free"]::before {
+#roe-buttons-container button[title="Hold"]::before {
     background-image: url( "/themes/olympus/images/icons_roe_stop_light.svg");
 }
 
-#roe-buttons-container button[title="Designated"]::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_light.svg");
+#roe-buttons-container button[title="Hold"].selected::before {
+    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
 }
 
+/**/
+
 #roe-buttons-container button[title="Return"]::before {
+    background-image: url( "/themes/olympus/images/icons_roe_defend_light.svg");
+}
+
+#roe-buttons-container button[title="Return"].selected::before {
+    background-image: url( "/themes/olympus/images/icons_roe_defend_dark.svg");
+}
+
+/**/
+
+#roe-buttons-container button[title="Designated"]::before {
     background-image: url( "/themes/olympus/images/icons_roe_target_light.svg");
 }
 
-#roe-buttons-container button[title="Hold"]::before {
-    background-image: url( "/themes/olympus/images/icons_actions_nothing_light.svg");
+#roe-buttons-container button[title="Designated"].selected::before {
+    background-image: url( "/themes/olympus/images/icons_roe_target_dark.svg");
+}
+
+/**/
+
+#roe-buttons-container button[title="Free"]::before {
+    background-image: url( "/themes/olympus/images/icons_roe_free_light.svg");
 }
 
 #roe-buttons-container button[title="Free"].selected::before {
     background-image: url( "/themes/olympus/images/icons_roe_free_dark.svg");
 }
 
-#roe-buttons-container button[title="Designated free"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
-}
-
-#roe-buttons-container button[title="Designated"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
-}
-
-#roe-buttons-container button[title="Return"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_target_dark.svg");
-}
-
-#roe-buttons-container button[title="Hold"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_actions_nothing_dark.svg");
-}
 
+/****************************************************************************************/
 
 
 #reaction-to-threat-buttons-container button[title="None"]::before {
-    background-image: url( "/themes/olympus/images/icons_actions_nothing_light.svg");
+    background-image: url( "/themes/olympus/images/icons_threat_nothing_light.svg");
 }
 
-#reaction-to-threat-buttons-container button[title="Passive"]::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_light.svg");
-}
-
-#reaction-to-threat-buttons-container button[title="Evade"]::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_light.svg");
-}
-
-#reaction-to-threat-buttons-container button[title="Escape"]::before {
-    background-image: url( "/themes/olympus/images/icons_threat_retreat_light.svg");
-}
-
-#reaction-to-threat-buttons-container button[title="Abort"]::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_light.svg");
-}
-#reaction-to-threat-buttons-container button[title="None"]::before {
-    background-image: url( "/themes/olympus/images/icons_actions_nothing_light.svg");
-}
-
-
 #reaction-to-threat-buttons-container button[title="None"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_actions_nothing_dark.svg");
+    background-image: url( "/themes/olympus/images/icons_threat_nothing_dark.svg");
+}
+
+
+/**/
+
+
+#reaction-to-threat-buttons-container button[title="Passive"]::before {
+    background-image: url( "/themes/olympus/images/icons_threat_cms_light.svg");
 }
 
 #reaction-to-threat-buttons-container button[title="Passive"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
+    background-image: url( "/themes/olympus/images/icons_threat_cms_dark.svg");
+}
+
+
+/**/
+
+
+#reaction-to-threat-buttons-container button[title="Evade"]::before {
+    background-image: url( "/themes/olympus/images/icons_threat_defend_light.svg");
 }
 
 #reaction-to-threat-buttons-container button[title="Evade"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
+    background-image: url( "/themes/olympus/images/icons_threat_defend_dark.svg");
 }
 
-#reaction-to-threat-buttons-container button[title="Escape"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_threat_retreat_dark.svg");
-}
 
-#reaction-to-threat-buttons-container button[title="Abort"].selected::before {
-    background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
-}
+/****************************************************************************************/
 
 
 #splash-screen {
diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts
index 23f7d50c..453351aa 100644
--- a/client/src/panels/unitcontrolpanel.ts
+++ b/client/src/panels/unitcontrolpanel.ts
@@ -4,11 +4,14 @@ import { aircraftDatabase } from "../units/aircraftdatabase";
 import { groundUnitsDatabase } from "../units/groundunitsdatabase";
 import { Aircraft, GroundUnit, Unit } from "../units/unit";
 import { UnitDatabase } from "../units/unitdatabase";
-import { UnitsManager } from "../units/unitsmanager";
 import { Panel } from "./panel";
 
-const ROEs: string[] = ["Free", "Designated free", "Designated", "Return", "Hold"];
-const reactionsToThreat: string[] = ["None", "Passive", "Evade", "Escape", "Abort"];
+//  const ROEs: string[] = ["Free", "Designated free", "Designated", "Return", "Hold"];  //  Full list
+//  const reactionsToThreat: string[] = ["None", "Passive", "Evade", "Escape", "Abort"];  //  Full list
+
+const ROEs: string[] = [ "Hold", "Return", "Designated", "Free" ];
+const reactionsToThreat: string[] = [ "None", "Passive", "Evade"  ];
+
 const minSpeedValues: { [key: string]: number } = { Aircraft: 100, Helicopter: 0, NavyUnit: 0, GroundUnit: 0 };
 const maxSpeedValues: { [key: string]: number } = { Aircraft: 800, Helicopter: 300, NavyUnit: 60, GroundUnit: 60 };
 const speedIncrements: { [key: string]: number } = { Aircraft: 25, Helicopter: 10, NavyUnit: 5, GroundUnit: 5 };