diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_circle-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_circle-lit.png
deleted file mode 100644
index 67bbff2537..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_circle-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e9637cf0597ebe24854c570766a30e83fd96d93b0ff3b38ce6ac7d23ec44ba4
-size 2348
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_square-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_square-lit.png
deleted file mode 100644
index 919eb8c129..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_default_square-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fa58045f344de27f8aefa2ba2ecba1d894e6c2eb531509de3eec5e1cfb9f1ec
-size 370
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_flora_deciduotree-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_flora_deciduotree-lit.png
deleted file mode 100644
index a81ca5c4da..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_flora_deciduotree-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:513ba36be55999dc083a9f2c820704c9da0355007b88c39d5748377d80eaedd2
-size 9385
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_action-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_action-lit.png
deleted file mode 100644
index bc51ba09a0..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_action-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77d094e283574179249c28cd37a0b442daf366d4680251b05e2a72c533a71d3c
-size 70574
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_celt-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_celt-lit.png
deleted file mode 100644
index e30d2ba0ef..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_celt-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e2ea3ae6a5102bd35dc347db69ef73ca2c51418215310e361c10178b2bd6dd0
-size 8632
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_hele-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_hele-lit.png
deleted file mode 100644
index bfdfb687a8..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_hele-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de987764bfaf1e902c5236866bd74520b7499c93dba4f867680646d81dfae41a
-size 8570
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_iber-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_iber-lit.png
deleted file mode 100644
index 11c82be011..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_iber-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02eecc91b6a547d84dfd65532e0fe8b478af15289e4e6e18096f6c713d376479
-size 8061
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_kart-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_kart-lit.png
deleted file mode 100644
index d6e9c422dd..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_kart-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7a4c5895270b8c2c4a3f9c044ce19a27051acfb4b2f0948b8d8b00387497c31
-size 8730
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_pers-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_pers-lit.png
deleted file mode 100644
index acddd395fe..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_pers-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:712b50098b89485d6c905434499824f386ea57db248708debcb543b2094468dc
-size 8615
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_rome-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_rome-lit.png
deleted file mode 100644
index a86e65101e..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_civ_rome-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96c50549d38961ff85b982d766e89b4419b540a158ab9af7f6a1731684878f52
-size 8926
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_tech_gen-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_tech_gen-lit.png
deleted file mode 100644
index bdaaeda3ad..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_sheet_tech_gen-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7369547a25f659a78d351453014cec0978edf906d58ac475f6e73f85e651da4f
-size 4062
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dude-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dude-lit.png
deleted file mode 100644
index 7321871f49..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dude-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c58162b98da7c48eb76548dc1910f7dbf286b9367d2823cfecbb0ce49ffe3030
-size 9088
diff --git a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dudette-lit.png b/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dudette-lit.png
deleted file mode 100644
index 0b2f3c496a..0000000000
--- a/binaries/data/mods/official/art/textures/ui/session/portraits/ui_portrait_unit_dudette-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63e6684a996ca3485c9f4396f5b23c0b3f3d1d2c63a482d1883879f33bf4699d
-size 9123
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 88b7dfead4..1b98187f56 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -397,7 +397,8 @@
                         <image texture="session/portraits/ui_portrait_default_circle.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_default_circle-lit">
-                        <image texture="session/portraits/ui_portrait_default_circle-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_default_circle.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_default_circle-grey">
                         <image texture="session/portraits/ui_portrait_default_circle-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
@@ -408,7 +409,8 @@
                         <image texture="session/portraits/ui_portrait_default_square.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_default_square-lit">
-                        <image texture="session/portraits/ui_portrait_default_square-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_default_square.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_default_square-grey">
                         <image texture="session/portraits/ui_portrait_default_square-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
@@ -424,7 +426,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_action.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_action-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_action-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+			<image texture="session/portraits/ui_portrait_sheet_action.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_action-grey">
                         <image texture="session/portraits/ui_portrait_sheet_action-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
@@ -441,7 +444,8 @@
                         <image texture="session/portraits/ui_portrait_unit_dude.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_unit_dude-lit">
-                        <image texture="session/portraits/ui_portrait_unit_dude-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_unit_dude-grey">
                         <image texture="session/portraits/ui_portrait_unit_dude-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
@@ -452,7 +456,8 @@
                         <image texture="session/portraits/ui_portrait_unit_dudette.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_unit_dudette-lit">
-                        <image texture="session/portraits/ui_portrait_unit_dudette-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_unit_dudette-grey">
                         <image texture="session/portraits/ui_portrait_unit_dudette-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
@@ -463,7 +468,8 @@
                         <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_flora_deciduotree-lit">
-                        <image texture="session/portraits/ui_portrait_flora_deciduotree-lit.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
                 <sprite name="ui_portrait_flora_deciduotree-grey">
                         <image texture="session/portraits/ui_portrait_flora_deciduotree-grey.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
@@ -482,7 +488,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_celt-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_celt-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_celt-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -498,7 +505,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_hele-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_hele-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_hele-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -514,7 +522,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_iber-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_iber-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_iber-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -530,7 +539,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_kart-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_kart-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_kart-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -546,7 +556,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_pers-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_pers-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_pers-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -562,7 +573,8 @@
                         <image texture="session/portraits/ui_portrait_sheet_civ_rome-grey.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
                 <sprite name="ui_portrait_sheet_civ_rome-lit">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_rome-lit.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+			<effect add-color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
         <!--
@@ -602,7 +614,7 @@
                 <image texture="global/ui_gen_bullet-icon.png" size="0 0 100% 100%" texture-size="0 0 8 8" />
         </sprite>
 
-        <sprite name="0ad_icon">
+        <sprite name="infinity_icon">
                 <image texture="global/ui_gen_infinity-icon.png" size="0 0 100% 100%" texture-size="0 0 16 16" />
         </sprite>