diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index 09d1e7f5fb..2ee58b4d09 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -322,6 +322,7 @@ button[type=action] {
 	line-height: 100%;
 	text-shadow:  0 1px 1px rgba(0,0,0,1);
 }
+button[type=action].sheet-mod-reset,
 button[type=action].sheet-chan-reset,
 button[type=action].sheet-tab-conditions-button,
 button[type=action].sheet-cond-reset {
@@ -1981,15 +1982,31 @@ button.sheet-cond-reset {
 	margin-bottom: -20px;
 	left: 4px;
 	top: -2px;
-	border: 0px solid #a9a9a9;
+	border: 1px solid #a9a9a9;
 	border-radius: 0px 4px 4px 0px;
 	background-color: transparent;
 }
+button.sheet-mod-reset {
+	display: inline-block;
+	width: 17px;
+	height: 17px;
+	font-size: 10px;
+	text-align: center;
+	vertical-align: text-top;
+	margin-bottom: -20px;
+	left: 4px;
+	bottom: 4px;
+	border: 1px solid #a9a9a9;
+	border-radius: 0px 4px 4px 0px;
+	background-color: transparent;
+}
+button.sheet-mod-reset:hover
 button.sheet-cond-reset:hover {
 	background-color: #615c50;
 	color: white;
 	background-image: linear-gradient(rgba(255,255,255,.3), rgba(255,255,255,0));
 }
+.sheet-mod-reset
 .sheet-cond-reset {
 	font-style: normal;
 	font-family: pictos;
@@ -5432,7 +5449,7 @@ input.sheet-condition[value="1"] ~ *.sheet-condition {
 
 
 select.sheet-select-no-arrow-center2-w {
-	width: 40px !important;	
+	width: 38px !important;	
 	margin: 0;
 	padding-right: 2px;
 	text-align-last: center;
@@ -5442,7 +5459,7 @@ select.sheet-select-no-arrow-center2-w {
 }
 @media screen and (-webkit-min-device-pixel-ratio:0){ 
 	select.sheet-select-no-arrow-center2-w {
-		width: 40px !important;	
+		width: 38px !important;	
 		height: 20.5px !important;
 		margin-top: 0px !important;
 		text-indent: 0px !important;
@@ -5450,7 +5467,7 @@ select.sheet-select-no-arrow-center2-w {
 }
 @media screen and/*!*/(-webkit-min-device-pixel-ratio:0){ 
 	select.sheet-select-no-arrow-center2-w {
-		width: 40px !important;	
+		width: 38px !important;	
 		height: 20.5px !important;
 		margin-top: 0px !important;
 		text-indent: 0px !important;
@@ -5458,7 +5475,7 @@ select.sheet-select-no-arrow-center2-w {
 }
 @media(-webkit-min-device-pixel-ratio:0) {
 	select.sheet-select-no-arrow-center2-w {
-		width: 40px !important;	
+		width: 38px !important;	
 		height: 20.5px !important;
 		margin-top: 0px !important;
 		text-indent: 0px !important;
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index e9dc3ca915..ff2cbbfff4 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -313,25 +313,25 @@
 			<div class="sheet-col-13-125 sheet-seperator-cap sheet-r sheet-pad-l-md sheet-pad-t-md">
 			</div>
 	<input type="checkbox" name="attr_talentmode" class="sheet-hidden sheet-hider" value="1"  />
-			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center" style="position: relative;left: 3px;">
+			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center" style="position: relative;left: 6px;">
 				<input type="checkbox" name="attr_MagicMode_hide" class="sheet-tab-gmwhisper" value="1"/>
 				<span class="sheet-tab-gmwhisper" style="width: 65px;">
 					<span data-i18n="MAGIC">Magic</span><span style="font-family: pictos;"> n</span>
 				</span>
 			</div>
-			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center">
+			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center"style="position: relative ; left: 3px">
 				<input type="checkbox" name="attr_MeleeMode_hide" class="sheet-tab-gmwhisper"  value="1"/>
 				<span class="sheet-tab-gmwhisper" style="width: 65px;">
 					<span data-i18n="MELEE">Melee</span><span style="font-family: pictos;"> n</span>
 				</span>
 			</div>
-			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center">
+			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center"style="position: relative ; left: 3px">
 				<input type="checkbox" name="attr_RangedMode_hide" class="sheet-tab-gmwhisper"  value="1"/>
 				<span class="sheet-tab-gmwhisper" style="width: 70px;">
 					<span data-i18n="RANGED">Ranged</span><span style="font-family: pictos;"> n</span>
 				</span>
 			</div>
-			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center">
+			<div class="sheet-col-1-10 sheet-pad-r-sm sheet-center" style="position: relative ; left: 3px">
 				<input type="hidden" name="attr_Whisper" value="0"/>
 				<input type="checkbox" name="attr_Whisper" class="sheet-tab-gmwhisper"  value="/w GM"/>
 				<span class="sheet-tab-gmwhisper">
@@ -346,7 +346,7 @@
 				</span>
 			</div>
 			<div class="sheet-col-25-1 sheet-center">
-			<button class="sheet-cond-reset" type="action" name="act_activate"  data-i18n-title="COND-RESET" title="Reset Conditions"><span>1</span></button>
+			<button class="sheet-cond-reset" type="action" name="act_activate"  data-i18n-title="COND-RESET" title="Reset Conditions"><span style="font-family: pictos;">1</span></button>
 			</div>
 
 			<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">
@@ -761,15 +761,6 @@
 					</button>
 				</div>
 			</div>
-
-				<div class="col-1-100" style=" position: relative; bottom: 16px; right: 18px; font-stretch: ultra-expanded; "><label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px; color: #666666;">
-		<input class="talsetshow-check__hide" type="hidden" name="attr_RangedMode_hide" value="0"/>
-		<div><input class="talsetshow-check__hide" type="checkbox" name="attr_RangedMode_hide" value="1"/><span class="talsetshow-check__span" style="vertical-align: text-top; font-size: 16px; line-height: 12px;" checked="unchecked">n</span></div>
-              </label></div>
-				<div class="col-1-100" style=" position: relative; bottom: 16px; right: 345px; font-stretch: ultra-expanded; "><label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px; color: #666666;">
-		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeMode_hide" value="0"/>
-		<div><input class="talsetshow-check__hide" type="checkbox" name="attr_MeleeMode_hide" value="1"/><span class="talsetshow-check__span" style="vertical-align: text-top; font-size: 16px; line-height: 12px;" checked="unchecked">n</span></div>
-              </label></div>
 		</div>
 
 		<div class="sheet-row sheet-nowrap"  style="position: relative;">
@@ -819,7 +810,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_1" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingfireRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -833,7 +824,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_2" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingheavensRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -847,7 +838,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_3" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingmetalRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -861,7 +852,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_4" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingbeastsRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -875,7 +866,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_5" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellinglifeRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -889,7 +880,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_6" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellinglightRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -903,7 +894,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_7" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingdeathRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -917,7 +908,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_8" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingshadowsRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -931,7 +922,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_9" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingwitchRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -945,7 +936,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_10" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingdarkRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -959,7 +950,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_11" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingchaosRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -973,7 +964,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_12" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingGreatMawRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -987,7 +978,7 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 25px" >
 						<input type="number" name="attr_Quick_Spell_AccuSL_13" value="0" style="height: 19px;" />
 					</div>
-					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 25px" >
+					<div class="sheet-col-2-3 sheet-center sheet-vsmall-text sheet-vert-middle" style="position: relative ; right: 24px" >
 						<button type="action" class="sheet-vsmall-text" style="max-height: 15px; font-weight: bold; width: 100%" name="act_channellingmiscRoll"  >
 							<span data-i18n="CHANNEL"></span>
 						</button>	
@@ -1012,20 +1003,20 @@
 					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 5px; bottom: 2px">
 						<input type="value" class="sheet-center" name="attr_Quick_Pray_Target" value="(@{PrayChar}+@{PrayAdv}+@{PrayMisc}+(@{condgen}*-1))*@{PrayTaken}" style="height: 19px" disabled="" data-formula="(@{PrayChar}+@{PrayAdv}+@{PrayMisc}+(@{condgen}*-1))*@{PrayTaken}">
 					</div>
-					<div class="sheet-col-1-18 sheet-left sheet-mar-l-lg" style="height: 18px; position: relative ; right: 23px; bottom: 2px">
-						<button class="sheet-cond-reset" type="action" name="act_resetQuickPray" title="Reset" style="height: 19px"><span>1</span></button>
+					<div class="sheet-col-1-18 sheet-left sheet-mar-l-lg" style="height: 18px; position: relative ; right: 23px;">
+						<button class="sheet-mod-reset" type="action" name="act_resetQuickPray" title="Reset" style="height: 19px"><span style="font-family: pictos;">1</span></button>
 					</div>
 				</div>
 		<input type="checkbox" name="attr_Quick_Spell_show" class="sheet-hidden sheet-hider" value="1" />
-				<div class="sheet-col-1-4" style="position: relative; right: 1px; bottom: 2px;">
-					<div class="sheet-col-4-10 sheet-left" style="position: relative ">
+				<div class="sheet-col-1-4" style="position: relative; right: 1px">
+					<div class="sheet-col-4-10 sheet-left" style="position: relative; bottom: 2px; ">
 						<input type="number" name="attr_Quick_Spell_Mod" value="0" style="height: 19px">
 					</div>
-					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 5px">
+					<div class="sheet-col-1-3 sheet-left" style="position: relative ; right: 5px; bottom: 2px;">
 						<input type="value" class="sheet-center" name="attr_Quick_Spell_Target" value="(@{Advantage}*10*@{Advantage_casting})+(@{LangMagickChar}+@{LangMagickAdv}+@{LangMagickMisc}+@{Quick_Spell_Mod}+(@{condgen_see}*-1))*@{LangMagickTaken}" style="height: 19px" disabled="" data-formula="(@{Advantage}*10*@{Advantage_casting})+(@{LangMagickChar}+@{LangMagickAdv}+@{LangMagickMisc}+@{Quick_Spell_Mod}+(@{condgen_see}*-1))*@{LangMagickTaken}">
 					</div>
-					<div class="sheet-col-1-18 sheet-left sheet-mar-l-lg" style="height: 18px; position: relative ; right: 23px; top: 0px">
-						<button class="sheet-cond-reset" type="action" name="act_resetQuickSpell" title="Reset" style="height: 19px;"><span>1</span></button>
+					<div class="sheet-col-1-18 sheet-left sheet-mar-l-lg" style="height: 18px; position: relative ; right: 23px;">
+						<button class="sheet-mod-reset" type="action" name="act_resetQuickSpell" title="Reset" style="height: 19px;"><span style="font-family: pictos;">1</span></button>
 					</div>
 				</div>
 				</div>
@@ -1217,8 +1208,8 @@
 				<div class="sheet-col-1-6 sheet-left" style="position: relative; bottom: 2px;" >
 				<input type="value" class="sheet-center" name="attr_targetmelee" value="(@{Used_MeleeWeaponSkill}+@{Used_MeleeBonus})+((@{Advantage}*10)+(@{condgen_see_move}*-1))" style="height: 19px;" disabled />
 				</div>
-				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px; bottom: 1px;" >
-			<button class="sheet-cond-reset" type="action" name="act_resetMeleeMode" title="Reset" style="height: 19px;"><span>1</span></button>
+				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px;" >
+			<button class="sheet-mod-reset" type="action" name="act_resetMeleeMode" title="Reset" style="height: 19px;"><span style="font-family: pictos;">1</span></button>
 				</div>
 				</div>
 
@@ -1294,8 +1285,8 @@
 				<div class="sheet-col-1-6 sheet-left" style="position: relative; bottom: 2px;" >
 				<input type="value" class="sheet-center" name="attr_targetdefense" value="(@{Used_DefenseWeaponSkill}+@{Used_DefenseBonus})+((@{Advantage}*10)+(@{condgen_see_move}*-1))" style="height: 19px;" disabled />
 				</div>
-				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px; bottom: 1px;" >
-			<button class="sheet-cond-reset" type="action" name="act_resetDefenseMode" title="Reset" style="height: 19px;"><span>1</span></button>
+				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px;" >
+			<button class="sheet-mod-reset" type="action" name="act_resetDefenseMode" title="Reset" style="height: 19px;"><span style="font-family: pictos;">1</span></button>
 				</div>
 				</div>
 
@@ -1406,8 +1397,8 @@
 				<div class="sheet-col-1-6 sheet-left" style="position: relative; bottom: 2px;" >
 				<input type="value" class="sheet-center" name="attr_targetranged" value="(@{Used_RangedBalisticSkill}+@{Used_RangedBonus}+(@{Advantage}*10)+(@{condgen_see_move}*-1))" style="height: 19px;" disabled />
 				</div>
-				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px; bottom: 1px;" >
-			<button class="sheet-cond-reset" type="action" name="act_resetRangedMode" title="Reset" style="height: 19px;"><span>1</span></button>
+				<div class="sheet-col-1-9 sheet-left mar-l-lg" style="height: 18px; position: relative; right: 18px;" >
+			<button class="sheet-mod-reset" type="action" name="act_resetRangedMode" title="Reset" style="height: 19px;"><span style="font-family: pictos;">1</span></button>
 				</div>
 				</div>