diff --git a/client/public/stylesheets/layout.css b/client/public/stylesheets/layout.css
index 0fc20782..860d8409 100644
--- a/client/public/stylesheets/layout.css
+++ b/client/public/stylesheets/layout.css
@@ -155,7 +155,7 @@ dl.ol-data-grid dd {
 
 .ol-checkbox input[type="checkbox"]::before {
 	align-self: center;
-	background-image: url("/images/icons/square-check-solid.svg");
+	background-image: url("/images/icons/square-regular.svg");
 	background-repeat: no-repeat;
 	content: "";
 	filter: invert(100%);
@@ -166,7 +166,7 @@ dl.ol-data-grid dd {
 }
 
 .ol-checkbox input[type="checkbox"]:checked::before {
-	background-image: url("/images/icons/square-regular.svg");
+	background-image: url("/images/icons/square-check-solid.svg");
 }
 
 .ol-text-input input {
diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts
index d2f010e7..f3ac1957 100644
--- a/client/src/panels/unitcontrolpanel.ts
+++ b/client/src/panels/unitcontrolpanel.ts
@@ -210,12 +210,14 @@ export class UnitControlPanel extends Panel {
             (<HTMLElement>this.#advancedSettingsDialog.querySelector("#unit-name")).innerText = unit.getBaseData().unitName;
 
             if (getUnitsManager().getSelectedUnits().length == 1){
+
                 this.#radioCallsignDropdown.setOptions(["Enfield", "Springfield", "Uzi", "Colt", "Dodge", "Ford", "Chevy", "Pontiac"]);
                 this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
+                this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isTanker));
+                this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isAWACS));
 
                 var roles = aircraftDatabase.getByName(unit.getBaseData().name)?.loadouts.map((loadout) => {return loadout.roles})
                 if (roles != undefined && Array.prototype.concat.apply([], roles)?.includes("Tanker")){
-                    this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isTanker));
                     this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.classList.remove("hide");
                     this.#radioCallsignDropdown.setOptions(["Texaco", "Arco", "Shell"]);
                     this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
@@ -225,7 +227,6 @@ export class UnitControlPanel extends Panel {
                 }
 
                 if (roles != undefined && Array.prototype.concat.apply([], roles)?.includes("AWACS")){
-                    this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.setAttribute('checked', String(unit.getTaskData().isAWACS));
                     this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.classList.remove("hide");
                     this.#radioCallsignDropdown.setOptions(["Overlord", "Magic", "Wizard", "Focus", "Darkstar"]);
                     this.#radioCallsignDropdown.selectValue(unit.getTaskData().radioCallsign);
@@ -238,10 +239,8 @@ export class UnitControlPanel extends Panel {
 
     #applyAdvancedSettings()
     {
-        this.#advancedSettingsDialog.classList.add("hide");
-
-        const isTanker = <boolean> this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.checked;
-        const isAWACS= <boolean> this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.checked;
+        const isTanker = this.#advancedSettingsDialog.querySelector("#tanker-checkbox")?.querySelector("input")?.checked? true: false;
+        const isAWACS = false; //this.#advancedSettingsDialog.querySelector("#AWACS-checkbox")?.querySelector("input")?.checked? true: false;
         const TACANChannel = Number(this.#advancedSettingsDialog.querySelector("#TACAN-channel")?.querySelector("input")?.value);
         const TACANXY = this.#TACANXYDropdown.getValue();
         const TACANCallsign = <string> this.#advancedSettingsDialog.querySelector("#tacan-callsign")?.querySelector("input")?.value
@@ -255,5 +254,7 @@ export class UnitControlPanel extends Panel {
         var units = getUnitsManager().getSelectedUnits();
         if (units.length > 0)
             units[0].setAdvancedOptions(isTanker, isAWACS, TACANChannel, TACANXY, TACANCallsign, radioFrequency, radioCallsign, radioCallsignNumber);
+
+        this.#advancedSettingsDialog.classList.add("hide");
     }
 }
\ No newline at end of file
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
index 42c1b9e0..55e92a2c 100644
--- a/client/views/unitcontrolpanel.ejs
+++ b/client/views/unitcontrolpanel.ejs
@@ -112,7 +112,7 @@
 
             <div id="tanker-checkbox" class="ol-checkbox">
                 <label>
-                    <input type="checkbox"/>
+                    <input type="checkbox" />
                     Operate as tanker
                 </label>
             </div>
diff --git a/src/core/src/unit.cpp b/src/core/src/unit.cpp
index 7d77aa1e..815af80b 100644
--- a/src/core/src/unit.cpp
+++ b/src/core/src/unit.cpp
@@ -393,7 +393,7 @@ void Unit::setTACAN()
 	commandSS << "{"
 		<<	"id = 'ActivateBeacon',"
 		<<		"params = {"
-		<<			"type = 4,"
+		<<			"type = " << ((TACANXY.compare(L"X") == 0)? 4: 5) << ","
 		<<			"system = 4,"
 		<<			"name = Olympus_TACAN,"
 		<<			"callsign = " << TACANCallsign << ", "
@@ -412,7 +412,7 @@ void Unit::setRadio()
 			<<	"id = 'SetFrequency',"
 			<<		"params = {"
 			<<			"modulation = 0,"	// TODO Allow selection
-			<<			"frequency = " << TACANChannelToFrequency(TACANChannel, TACANXY) << ","
+			<<			"frequency = " << radioFrequency << ","
 			<<		"}"
 			<<	"}";
 		Command* command = dynamic_cast<Command*>(new SetCommand(ID, commandSS.str()));