diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt
index e50356c81..bc667fba2 100644
--- a/common/on_action/game_start.txt
+++ b/common/on_action/game_start.txt
@@ -605,84 +605,76 @@ on_game_start = {
 		}
 
 		### Britania SETUP ###
-		title:d_normandy.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
-			set_subject_contract_modification_blocked = no
-		}
-		title:d_ile_de_france.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
-			set_subject_contract_modification_blocked = no
-		}
 		title:d_channel_islands.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 5 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_galloway.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_strathclyde.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_cumbria.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_deheubarth.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_nottingham.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 3 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_canterbury.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 5 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_buckingham.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 4 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_somerset.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 2 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_leicester.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 2 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}		
 		title:d_cornwall.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_solent.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 5 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_hereford.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_bedford.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_black_country.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_gwent.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_gwynedd.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 2 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_lancaster.holder ?= {
-			vassal_contract_set_obligation_level = { type = administrative_themes level = 1 }
+			vassal_contract_set_obligation_level = { type = japan_administrative_provinces level = 1 }
 			set_subject_contract_modification_blocked = no
 		}
 		title:d_southern_corsica.holder ?= {
diff --git a/common/subject_contracts/contracts/administrative.txt b/common/subject_contracts/contracts/administrative.txt
index a3a048131..5e3e3adb6 100644
--- a/common/subject_contracts/contracts/administrative.txt
+++ b/common/subject_contracts/contracts/administrative.txt
@@ -106,7 +106,6 @@ administrative_themes = {
 				men_at_arms_maintenance = 0.05
 			}
 			
-			flag = vassal_contract_war_override
 			flag = admin_stewardship_obligation_bonus
 			flag = admin_influence_construction_bonus
 			flag = admin_ai_is_builder
@@ -169,6 +168,7 @@ administrative_themes = {
 				men_at_arms_cap = 1
 			}
 			
+			flag = vassal_contract_war_override
 			flag = admin_martial_obligation_bonus
 			flag = admin_theme_military
 			flag = province_military
@@ -232,6 +232,7 @@ administrative_themes = {
 				men_at_arms_maintenance = -0.05
 			}
 			
+			flag = vassal_contract_war_override
 			flag = admin_prowess_obligation_bonus
 			flag = admin_duchy_expansion_unlocked
 			flag = admin_ai_is_warlike
@@ -415,6 +416,7 @@ administrative_themes = {
 				men_at_arms_maintenance = -0.05
 			}
 			
+			flag = vassal_contract_war_override
 			flag = admin_naval_duchy_expansion_unlocked
 			flag = admin_tradeport_obligation_bonus
 			flag = admin_theme_naval
diff --git a/common/subject_contracts/contracts/japan_administrative.txt b/common/subject_contracts/contracts/japan_administrative.txt
index c569b75e1..a162472eb 100644
--- a/common/subject_contracts/contracts/japan_administrative.txt
+++ b/common/subject_contracts/contracts/japan_administrative.txt
@@ -24,7 +24,7 @@ japan_administrative_provinces = {
 		japan_administrative_province_standard = {
 			default = yes
 			position = { 0 0 }
-			icon = "gfx/interface/icons/celestial_administration_types/icon_standard_administration.dds"
+			icon = "gfx/interface/icons/celestial_administration_types/icon_standard_republic_administration.dds"
 			gui_tags = { civilian }
 			
 			ai_liege_desire = {
@@ -61,13 +61,12 @@ japan_administrative_provinces = {
 			
 			enable_title_maa = no
 			
-			flag = vassal_contract_war_override
 			flag = japan_administrative_province_standard
 			flag = province_civilian
 		}
 		japan_administrative_province_trade = {
 			position = { 1 0 }
-			icon = "gfx/interface/icons/celestial_administration_types/icon_industrial_administration.dds"
+			icon = "gfx/interface/icons/celestial_administration_types/icon_industrial_republic_administration.dds"
 			gui_tags = { civilian }
 			
 			ai_liege_desire = {
@@ -141,7 +140,6 @@ japan_administrative_provinces = {
 				build_speed = -0.2
 			}
 			
-			flag = vassal_contract_war_override
 			flag = admin_ai_is_builder
 			flag = japan_administrative_province_trade
 			flag = province_civilian
@@ -149,7 +147,7 @@ japan_administrative_provinces = {
 		}
 		japan_administrative_province_military = {
 			position = { 0 1 }
-			icon = "gfx/interface/icons/celestial_administration_types/icon_military_administration.dds"
+			icon = "gfx/interface/icons/celestial_administration_types/icon_military_republic_administration.dds"
 			gui_tags = { military }
 			
 			ai_liege_desire = {
@@ -236,6 +234,7 @@ japan_administrative_provinces = {
 				men_at_arms_maintenance = -0.15
 			}
 			
+			flag = vassal_contract_war_override
 			flag = japan_administrative_province_military
 			flag = japan_administrative_military_appointment
 			flag = province_military
diff --git a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_industrial_administration.dds b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_industrial_administration.dds
index 20a018f80..b05a79577 100644
--- a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_industrial_administration.dds
+++ b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_industrial_administration.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:806fbd4370af6953a5847cbe1e111194770e960670a936f7991a6d19041af202
-size 16512
+oid sha256:f6225550e711c0f1770bcc46d0ff8e8da9e53171d9dbfa2b7f456a84290da813
+size 5616
diff --git a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_military_administration.dds b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_military_administration.dds
index fc3b9827f..9a5f5364a 100644
--- a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_military_administration.dds
+++ b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_military_administration.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56b063fb09246e49686cc8b24c909c3c2e86a939b60eb4c9eeeb930056be68fc
-size 16512
+oid sha256:a4ed051737fbf311b460e9572ea77b405b57ba316dbd7aa153e08bf675dde2a2
+size 5616
diff --git a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_standard_administration.dds b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_standard_administration.dds
index 91ea7e839..d9980db8d 100644
--- a/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_standard_administration.dds
+++ b/gfx/interface/icons/celestial_administration_types/icon_game_concept_celestial_standard_administration.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbc411470613d364c38ed1e09b98dabcac219e5c4e0422616d888fa6f2062330
-size 16512
+oid sha256:8dfab9f2aa0ea65bbfef209849afc24d108a2bd2d120e567cb603fe3a7dce9fb
+size 5616