diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt
index 107d506..31aaaf9 100644
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -2,6 +2,9 @@
 
 rg_set_gray_portrait = {
 	change_leader_portrait = @gray_portrait
+	event_target:rg_gray_country_leader = {
+		change_leader_portrait = @gray_portrait
+	}
 }
 
 rg_create_gray_species = {
diff --git a/events/RG_gray_leader_dialog_event.txt b/events/RG_gray_leader_dialog_event.txt
index f697e7e..98dcb0b 100644
--- a/events/RG_gray_leader_dialog_event.txt
+++ b/events/RG_gray_leader_dialog_event.txt
@@ -31,7 +31,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = root.capital_scope
 		room = "ethic_spaceship_room"
 	}
@@ -75,7 +75,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = root.capital_scope
 		room = "ethic_spaceship_room"
 	}
@@ -119,7 +119,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = root.capital_scope
 		room = "ethic_spaceship_room"
 	}
@@ -163,7 +163,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = root.capital_scope
 		room = "ethic_spaceship_room"
 	}
@@ -207,7 +207,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -251,7 +251,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -295,7 +295,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -339,7 +339,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -382,7 +382,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -425,7 +425,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -468,7 +468,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -511,7 +511,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -554,7 +554,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_general
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -597,7 +597,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_general
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -640,7 +640,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_general
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -683,7 +683,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_scientist
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -726,7 +726,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_scientist
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -769,7 +769,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_scientist
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt
index 6d92c31..b672958 100644
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@@ -303,7 +303,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -438,7 +438,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_admiral
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -807,7 +807,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_general
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -1155,7 +1155,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_leader_scientist
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -1323,7 +1323,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -1467,7 +1467,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}
 
@@ -1526,7 +1526,7 @@ country_event = {
 	event_window_type = leader_recruit
 
 	picture_event_data = {
-		portrait = event_target:gray_governor
+		portrait = event_target:rg_gray_country_leader
 		room = "ethic_spaceship_room"
 	}