diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt
index c4e5b172a..ea0bd1ba7 100644
--- a/CHANGE LOG 1.0.6.txt	
+++ b/CHANGE LOG 1.0.6.txt	
@@ -8,6 +8,7 @@
 [NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade
 [NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf
 [NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz
+[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
 [NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
 [NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
 [NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz
diff --git a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
index e2ec389da..54bd5e4a1 100644
--- a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
@@ -256,7 +256,7 @@ class RscTitles
 			class RscPicture_1209: RscPictureGUI
 			{
 				idc = 1209;
-				//text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa";
+				//text = "\z\addons\dayz_code\gui\status\status_bg.paa";
 				x = "0.955313 * safezoneW + safezoneX";
 				y = "0.65 * safezoneH + safezoneY";
 				w = 0.06;
@@ -265,7 +265,7 @@ class RscTitles
 			class RscPicture_1909: RscPictureGUI
 			{
 				idc = 1909;
-				//text = "\z\addons\dayz_code\gui\status\status_bg.paa";
+				//text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa";
 				x = "0.955313 * safezoneW + safezoneX";
 				y = "0.65 * safezoneH + safezoneY";
 				w = 0.06;
diff --git a/SQF/dayz_code/compile/player_updateGui.sqf b/SQF/dayz_code/compile/player_updateGui.sqf
index 88317f270..3f9fb912d 100644
--- a/SQF/dayz_code/compile/player_updateGui.sqf
+++ b/SQF/dayz_code/compile/player_updateGui.sqf
@@ -33,13 +33,13 @@ _ctrlTempBorder ctrlSetTextColor [1,1,1,1];
 
 if (DZE_VanillaUICombatIcon) then {
 	_combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1};
-	_ctrlCombatBorder = _display displayCtrl 1209;
+	_ctrlCombatBorder = _display displayCtrl 1909;
 	_ctrlCombat = _display displayCtrl 1308;
-	_ctrlCombatBG = _display displayCtrl 1909;
+	_ctrlCombatBG = _display displayCtrl 1209;
 	_ctrlCombatBorder ctrlSetTextColor [1,1,1,1];
-	_ctrlCombat ctrlSetTextColor		[(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 0.5];
-    _ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_CA.paa");
-    _ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_ca.paa");
+	_ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 1];
+    _ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_new_CA.paa");
+    _ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_new_ca.paa");
     _ctrlCombatBG ctrlSetText ("\z\addons\dayz_code\gui\status\status_bg.paa");
 };
 _ctrlBlood = _display displayCtrl 1300;
diff --git a/SQF/dayz_code/gui/status/status_combat_border_new_CA.paa b/SQF/dayz_code/gui/status/status_combat_border_new_CA.paa
new file mode 100644
index 000000000..8d7657a0d
Binary files /dev/null and b/SQF/dayz_code/gui/status/status_combat_border_new_CA.paa differ
diff --git a/SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa b/SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa
new file mode 100644
index 000000000..8fa6c41c6
Binary files /dev/null and b/SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa differ