diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 05c027ffc3..bfdcf8ccc7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -678,9 +678,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/firestorm/colors.xml b/indra/newview/skins/firestorm/colors.xml
index d1fb0af2d1..b7375f35e9 100644
--- a/indra/newview/skins/firestorm/colors.xml
+++ b/indra/newview/skins/firestorm/colors.xml
@@ -653,9 +653,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/firestorm/themes/grey/colors.xml b/indra/newview/skins/firestorm/themes/grey/colors.xml
index 356450c8ec..6c553c4490 100644
--- a/indra/newview/skins/firestorm/themes/grey/colors.xml
+++ b/indra/newview/skins/firestorm/themes/grey/colors.xml
@@ -661,12 +661,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/firestormclear/colors.xml b/indra/newview/skins/firestormclear/colors.xml
index 9159a590e1..c7be0aa6e6 100644
--- a/indra/newview/skins/firestormclear/colors.xml
+++ b/indra/newview/skins/firestormclear/colors.xml
@@ -662,9 +662,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/firestormsidetabs/colors.xml b/indra/newview/skins/firestormsidetabs/colors.xml
index 1f7a461329..450cf4b43b 100644
--- a/indra/newview/skins/firestormsidetabs/colors.xml
+++ b/indra/newview/skins/firestormsidetabs/colors.xml
@@ -662,9 +662,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/firestormsidetabs/themes/grey/colors.xml b/indra/newview/skins/firestormsidetabs/themes/grey/colors.xml
index 332efad16d..728daace58 100644
--- a/indra/newview/skins/firestormsidetabs/themes/grey/colors.xml
+++ b/indra/newview/skins/firestormsidetabs/themes/grey/colors.xml
@@ -670,12 +670,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+ <!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/metaharper/colors.xml b/indra/newview/skins/metaharper/colors.xml
index 2a36db1bdc..2a2d058334 100644
--- a/indra/newview/skins/metaharper/colors.xml
+++ b/indra/newview/skins/metaharper/colors.xml
@@ -664,9 +664,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml b/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
index 577fc83e99..b0c1fb382e 100644
--- a/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
+++ b/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
@@ -659,12 +659,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/metaharpersidetabs/colors.xml b/indra/newview/skins/metaharpersidetabs/colors.xml
index 9159a590e1..c7be0aa6e6 100644
--- a/indra/newview/skins/metaharpersidetabs/colors.xml
+++ b/indra/newview/skins/metaharpersidetabs/colors.xml
@@ -662,9 +662,11 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
      reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
      reference="Green" />
diff --git a/indra/newview/skins/metaharpersidetabs/themes/appalachian_sky/colors.xml b/indra/newview/skins/metaharpersidetabs/themes/appalachian_sky/colors.xml
index 577fc83e99..b0c1fb382e 100644
--- a/indra/newview/skins/metaharpersidetabs/themes/appalachian_sky/colors.xml
+++ b/indra/newview/skins/metaharpersidetabs/themes/appalachian_sky/colors.xml
@@ -659,12 +659,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/starlight/colors.xml b/indra/newview/skins/starlight/colors.xml
index eab27ce29c..2d2eacd863 100644
--- a/indra/newview/skins/starlight/colors.xml
+++ b/indra/newview/skins/starlight/colors.xml
@@ -622,12 +622,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
index 4ba4f2a65c..c87041022c 100644
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
@@ -619,12 +619,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/starlight/themes/original_orange/colors.xml b/indra/newview/skins/starlight/themes/original_orange/colors.xml
index 04965128e4..fba91433ef 100644
--- a/indra/newview/skins/starlight/themes/original_orange/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_orange/colors.xml
@@ -619,12 +619,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/starlight/themes/original_teal/colors.xml b/indra/newview/skins/starlight/themes/original_teal/colors.xml
index 4cfc3e0699..5defa5329d 100644
--- a/indra/newview/skins/starlight/themes/original_teal/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_teal/colors.xml
@@ -619,12 +619,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="White_10" />
diff --git a/indra/newview/skins/starlight/themes/silver_blue/colors.xml b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
index b30c0d9853..2c171271f4 100644
--- a/indra/newview/skins/starlight/themes/silver_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
@@ -621,12 +621,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="Black_10" />
diff --git a/indra/newview/skins/starlight/themes/silver_pink/colors.xml b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
index 54f6775471..46609df41f 100644
--- a/indra/newview/skins/starlight/themes/silver_pink/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
@@ -621,12 +621,14 @@
     <color
      name="LoginProgressBoxTextColor"
      reference="White" />
+<!-- Changed Color -->
     <color
      name="MapAvatarColor"
-     reference="Green" />
+     reference="Red" />
+<!-- Changed Color -->
     <color
      name="MapAvatarFriendColor"
-     reference="Yellow" />
+     reference="Green" />
     <color
      name="MapFrustumColor"
      reference="Black_10" />