diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 02caec447d..389d420c32 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -464,6 +464,7 @@ with the same filename but different name
   <texture name="Permission_Visible_Map_h" file_name="icons/see_on_map_h.png" preload="false" />
   <texture name="Permission_Edit_Objects_Mine_h" file_name="icons/edit_mine_h.png" preload="false" />
   <texture name="Permission_Edit_Objects_Theirs_h" file_name="icons/edit_theirs_h.png" preload="false" />
+  <texture name="icon_avatar_online_h" file_name="legacy/icon_avatar_online_h.tga" />
 
   <texture name="Person_Check" file_name="icons/Person_Check.png" preload="false" />
   <texture name="Person_Star" file_name="icons/Person_Star.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
index 480e7565fa..039acc9beb 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
@@ -40,7 +40,7 @@
      tool_tip="Select an object from this list to highlight it in-world" >
 		<scroll_list.column
 		 name="icon_online_status"
-		 image="legacy/icon_avatar_online_h.tga"
+		 image="icon_avatar_online_h"
 		 tool_tip="Online status"
 		 width="20" />
 		<scroll_list.column
diff --git a/indra/newview/skins/starlight/textures/icons/edit_mine_h.png b/indra/newview/skins/starlight/textures/icons/edit_mine_h.png
new file mode 100644
index 0000000000..f0e5d8794e
Binary files /dev/null and b/indra/newview/skins/starlight/textures/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/textures/icons/edit_theirs_h.png b/indra/newview/skins/starlight/textures/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..56b82084ea
Binary files /dev/null and b/indra/newview/skins/starlight/textures/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/textures/icons/icon_avatar_online.png b/indra/newview/skins/starlight/textures/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..dbcb017259
Binary files /dev/null and b/indra/newview/skins/starlight/textures/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/textures/icons/see_me_online_h.png b/indra/newview/skins/starlight/textures/icons/see_me_online_h.png
new file mode 100644
index 0000000000..d48d9f60d1
Binary files /dev/null and b/indra/newview/skins/starlight/textures/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/textures/icons/see_on_map_h.png b/indra/newview/skins/starlight/textures/icons/see_on_map_h.png
new file mode 100644
index 0000000000..57e12c7978
Binary files /dev/null and b/indra/newview/skins/starlight/textures/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/textures/textures.xml b/indra/newview/skins/starlight/textures/textures.xml
index e4d8273474..80e7df3f73 100644
--- a/indra/newview/skins/starlight/textures/textures.xml
+++ b/indra/newview/skins/starlight/textures/textures.xml
@@ -799,13 +799,12 @@ with the same filename but different name
   <texture name="Music_Press" file_name="icons/Music_Press.png" preload="true" />
   <texture name="phoenix_18" file_name="bottomtray/phoenix_18.png" preload="false" />
   
-  <texture name="ff_online_status_button"			file_name="legacy/ff_online_status_button.tga"		preload="false" />
-  <texture name="ff_visible_online_button"		file_name="legacy/ff_visible_online_button.tga"		preload="false" />
-  <texture name="ff_visible_map_button"			file_name="legacy/ff_visible_map_button.tga"		preload="false" />
-  <texture name="ff_edit_mine_button"				file_name="legacy/ff_edit_mine_button.tga"			preload="false" />
-  <texture name="ff_visible_map_button_theirs"	file_name="legacy/ff_visible_map_button_theirs.tga"	preload="false" />
-  <texture name="ff_edit_theirs_button"			file_name="legacy/ff_edit_theirs_button.tga"		preload="false" />
-  <texture name="icon_avatar_online"			file_name="legacy/icon_avatar_online.tga"		preload="false" />
+  <texture name="Permission_Visible_Online_h" file_name="icons/see_me_online_h.png" preload="false" />
+  <texture name="Permission_Visible_Map_h" file_name="icons/see_on_map_h.png" preload="false" />
+  <texture name="Permission_Edit_Objects_Mine_h" file_name="icons/edit_mine_h.png" preload="false" />
+  <texture name="Permission_Edit_Objects_Theirs_h" file_name="icons/edit_theirs_h.png" preload="false" />
+  <texture name="icon_avatar_online"			file_name="icons/icon_avatar_online.png"		preload="false" />
+  <texture name="icon_avatar_online_h"			file_name="icons/icon_avatar_online.png"                preload="false" />
   <texture name="slim_icon_16_viewer"				file_name="slim_icon_16_viewer.tga"					preload="false" />
   
   <!-- Firstorm virtual system folders - added in FS 2.6.1 -->
diff --git a/indra/newview/skins/starlight/themes/mono_teal/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/mono_teal/icons/edit_mine_h.png
new file mode 100644
index 0000000000..522bf2ee47
Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/mono_teal/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/mono_teal/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..757abcdc7e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/mono_teal/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/mono_teal/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..39cf21aa54
Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/mono_teal/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/mono_teal/icons/see_me_online_h.png
new file mode 100644
index 0000000000..67fa85a506
Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/mono_teal/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/mono_teal/icons/see_on_map_h.png
new file mode 100644
index 0000000000..734b36d0e9
Binary files /dev/null and b/indra/newview/skins/starlight/themes/mono_teal/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_mine_h.png
new file mode 100644
index 0000000000..f0e5d8794e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..56b82084ea
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..dbcb017259
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_me_online_h.png
new file mode 100644
index 0000000000..d48d9f60d1
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_on_map_h.png
new file mode 100644
index 0000000000..57e12c7978
Binary files /dev/null and b/indra/newview/skins/starlight/themes/nostalgia_blue/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/original_orange/icons/edit_mine_h.png
new file mode 100644
index 0000000000..f0e5d8794e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/original_orange/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..56b82084ea
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/original_orange/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..dbcb017259
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/original_orange/icons/see_me_online_h.png
new file mode 100644
index 0000000000..d48d9f60d1
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_orange/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/original_orange/icons/see_on_map_h.png
new file mode 100644
index 0000000000..57e12c7978
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_orange/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/original_teal/icons/edit_mine_h.png
new file mode 100644
index 0000000000..f0e5d8794e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/original_teal/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..56b82084ea
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/original_teal/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..dbcb017259
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/original_teal/icons/see_me_online_h.png
new file mode 100644
index 0000000000..d48d9f60d1
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/original_teal/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/original_teal/icons/see_on_map_h.png
new file mode 100644
index 0000000000..57e12c7978
Binary files /dev/null and b/indra/newview/skins/starlight/themes/original_teal/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/silver_blue/icons/edit_mine_h.png
new file mode 100644
index 0000000000..522bf2ee47
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/silver_blue/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..757abcdc7e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/silver_blue/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..39cf21aa54
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/silver_blue/icons/see_me_online_h.png
new file mode 100644
index 0000000000..67fa85a506
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_blue/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/silver_blue/icons/see_on_map_h.png
new file mode 100644
index 0000000000..734b36d0e9
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_blue/icons/see_on_map_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/icons/edit_mine_h.png b/indra/newview/skins/starlight/themes/silver_pink/icons/edit_mine_h.png
new file mode 100644
index 0000000000..522bf2ee47
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/icons/edit_mine_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/icons/edit_theirs_h.png b/indra/newview/skins/starlight/themes/silver_pink/icons/edit_theirs_h.png
new file mode 100644
index 0000000000..757abcdc7e
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/icons/edit_theirs_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/icons/icon_avatar_online.png b/indra/newview/skins/starlight/themes/silver_pink/icons/icon_avatar_online.png
new file mode 100644
index 0000000000..39cf21aa54
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/icons/icon_avatar_online.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/icons/see_me_online_h.png b/indra/newview/skins/starlight/themes/silver_pink/icons/see_me_online_h.png
new file mode 100644
index 0000000000..67fa85a506
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/icons/see_me_online_h.png differ
diff --git a/indra/newview/skins/starlight/themes/silver_pink/icons/see_on_map_h.png b/indra/newview/skins/starlight/themes/silver_pink/icons/see_on_map_h.png
new file mode 100644
index 0000000000..734b36d0e9
Binary files /dev/null and b/indra/newview/skins/starlight/themes/silver_pink/icons/see_on_map_h.png differ