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