diff --git a/gfx/Electric/BR8X.png b/gfx/Electric/BR8X.png
index 01dd5315..1218cc26 100644
Binary files a/gfx/Electric/BR8X.png and b/gfx/Electric/BR8X.png differ
diff --git a/src/trains/electric/18100.pnml b/src/trains/electric/18100.pnml
index c1c51b3c..1cdaca26 100644
--- a/src/trains/electric/18100.pnml
+++ b/src/trains/electric/18100.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_18100_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_18100_BRBlack, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 13)
+	template_train32px(0, 13)
 }
 
 switch(FEAT_TRAINS,SELF, sw_18100, cargo_subtype){
diff --git a/src/trains/electric/BR80.pnml b/src/trains/electric/BR80.pnml
index f287e9c8..2ae292bb 100644
--- a/src/trains/electric/BR80.pnml
+++ b/src/trains/electric/BR80.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR80_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR80_BRBlack, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 38)
+	template_train32px(0, 39)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR80, cargo_subtype){
diff --git a/src/trains/electric/BR81.pnml b/src/trains/electric/BR81.pnml
index cfb1a8d0..49aa22e3 100644
--- a/src/trains/electric/BR81.pnml
+++ b/src/trains/electric/BR81.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR81_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR81_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR81, cargo_subtype){
diff --git a/src/trains/electric/BR82.pnml b/src/trains/electric/BR82.pnml
index d1075c9a..a177f053 100644
--- a/src/trains/electric/BR82.pnml
+++ b/src/trains/electric/BR82.pnml
@@ -1,13 +1,13 @@
 spriteset(spriteset_BR82_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 13)
+	template_purchase(264, 13)
 }
 
 spriteset(spriteset_BR82_InterCityExecutive, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 88)
+	template_train32px(0, 91)
 }
 
 spriteset(spriteset_BR82_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR82, cargo_subtype){
diff --git a/src/trains/electric/BR83.pnml b/src/trains/electric/BR83.pnml
index 35c872e2..8fa6b834 100644
--- a/src/trains/electric/BR83.pnml
+++ b/src/trains/electric/BR83.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR83_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR83_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR83, cargo_subtype){
diff --git a/src/trains/electric/BR84.pnml b/src/trains/electric/BR84.pnml
index c2fa15e8..ba2a6fc4 100644
--- a/src/trains/electric/BR84.pnml
+++ b/src/trains/electric/BR84.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR84_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR84_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR84, cargo_subtype){
diff --git a/src/trains/electric/BR85.pnml b/src/trains/electric/BR85.pnml
index 65662804..d5439e4e 100644
--- a/src/trains/electric/BR85.pnml
+++ b/src/trains/electric/BR85.pnml
@@ -1,13 +1,13 @@
 spriteset(spriteset_BR85_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 26)
+	template_purchase(264, 26)
 }
 
 spriteset(spriteset_BR85_RailfreightDistribution, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 113)
+	template_train32px(0, 117)
 }
 
 spriteset(spriteset_BR85_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR85, cargo_subtype){
diff --git a/src/trains/electric/BR86.pnml b/src/trains/electric/BR86.pnml
index 36f943fa..c6cafab0 100644
--- a/src/trains/electric/BR86.pnml
+++ b/src/trains/electric/BR86.pnml
@@ -1,33 +1,33 @@
 spriteset(spriteset_BR86_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 39)
+	template_purchase(264, 39)
 }
 
 spriteset(spriteset_BR86_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 spriteset(spriteset_BR86_InterCityExecutive, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 88)
+	template_train32px(0, 91)
 }
 
 spriteset(spriteset_BR86_InterCitySwallow, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 138)
+	template_train32px(0, 143)
 }
 
 spriteset(spriteset_BR86_RailfreightDistribution, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 113)
+	template_train32px(0, 117)
 }
 
 spriteset(spriteset_BR86_RailExpress, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 188)
+	template_train32px(0, 195)
 }
 
 spriteset(spriteset_BR86_EWS, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 163)
+	template_train32px(0, 169)
 }
 
 spriteset(spriteset_BR86_Anglia, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 288)
+	template_train32px(0, 299)
 }
 
 // This switch called when displaying as this locomotive
diff --git a/src/trains/electric/BR87.pnml b/src/trains/electric/BR87.pnml
index 47f39114..95f311d4 100644
--- a/src/trains/electric/BR87.pnml
+++ b/src/trains/electric/BR87.pnml
@@ -3,15 +3,15 @@ spriteset(spriteset_BR87_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR87_InterCitySwallow, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 213)
+	template_train32px(0, 221)
 }
 
 spriteset(spriteset_BR87_Virgin, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 238)
+	template_train32px(0, 247)
 }
 
 spriteset(spriteset_BR87_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 263)
+	template_train32px(0, 273)
 }
 
 // This switch called when displaying as this locomotive