diff --git a/indra/newview/skins/default/xui/de/floater_facebook.xml b/indra/newview/skins/default/xui/de/floater_facebook.xml
index c1b7a68bef..f0db0988dd 100644
--- a/indra/newview/skins/default/xui/de/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/de/floater_facebook.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater name="floater_social" title="Posten auf Facebook">
+<floater name="floater_facebook" title="Posten auf Facebook">
 	<panel name="background">
 		<tab_container name="tabs">
-			<panel label="Status" name="panel_social_status"/>
-			<panel label="Foto" name="panel_social_photo"/>
-			<panel label="Ort" name="panel_social_place"/>
-			<panel label="Konto" name="panel_social_account"/>
+			<panel label="Status" name="panel_facebook_status"/>
+			<panel label="Foto" name="panel_facebook_photo"/>
+			<panel label="Ort" name="panel_facebook_place"/>
+			<panel label="Freunde" name="panel_facebook_friends"/>
+			<panel label="Konto" name="panel_facebook_account"/>
 		</tab_container>
 		<panel name="connection_status_panel">
 			<text name="connection_error_text">
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_account.xml b/indra/newview/skins/default/xui/de/panel_facebook_account.xml
index f4e01d2d66..89ec9dfbaf 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_account">
+<panel name="panel_facebook_account">
 	<string name="facebook_connected" value="Angemeldet bei Facebook als:" />
 	<string name="facebook_disconnected" value="Nicht bei Facebook angemeldet." />
 	<text name="account_caption_label">
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
index 184e24b2bd..44c98b08d0 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_photo">
+<panel name="panel_facebook_photo">
 	<layout_stack name="stack_photo">
 		<layout_panel name="snapshot_panel">
 			<combo_box name="resolution_combobox" tool_tip="Bild-Auflösung">
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_place.xml b/indra/newview/skins/default/xui/de/panel_facebook_place.xml
index adbebcdb8a..8ac39550c8 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_place">
+<panel name="panel_facebook_place">
 	<layout_stack name="stack_place">
 		<layout_panel name="place_detail_panel">
 			<text name="place_caption_label">
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_status.xml b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
index 8e270a2daa..851bb001eb 100644
--- a/indra/newview/skins/default/xui/de/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_status">
+<panel name="panel_facebook_status">
 	<layout_stack name="stack_status">
 		<layout_panel name="status_detail_panel">
 			<text name="status_caption_label">
diff --git a/indra/newview/skins/default/xui/es/floater_facebook.xml b/indra/newview/skins/default/xui/es/floater_facebook.xml
index 069c420bdb..facaeb1523 100644
--- a/indra/newview/skins/default/xui/es/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/es/floater_facebook.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater name="floater_social" title="Publicar en Facebook">
+<floater name="floater_facebook" title="Publicar en Facebook">
 	<panel name="background">
 		<tab_container name="tabs">
-			<panel label="Estado" name="panel_social_status"/>
-			<panel label="Foto" name="panel_social_photo"/>
-			<panel label="Ubicación" name="panel_social_place"/>
-			<panel label="Cuenta" name="panel_social_account"/>
+			<panel label="Estado" name="panel_facebook_status"/>
+			<panel label="Foto" name="panel_facebook_photo"/>
+			<panel label="Ubicación" name="panel_facebook_place"/>
+			<panel label="Cuenta" name="panel_facebook_account"/>
 		</tab_container>
 		<panel name="connection_status_panel">
 			<text name="connection_error_text">
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_account.xml b/indra/newview/skins/default/xui/es/panel_facebook_account.xml
index a9b7724d14..4aa9d57a24 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_account">
+<panel name="panel_facebook_account">
 	<string name="facebook_connected" value="Estás conectado a Facebook como:"/>
 	<string name="facebook_disconnected" value="No estás conectado a Facebook"/>
 	<text name="account_caption_label">
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml b/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
index 8188e5eeba..9c35048cfa 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_photo">
+<panel name="panel_facebook_photo">
 	<layout_stack name="stack_photo">
 		<layout_panel name="snapshot_panel">
 			<combo_box name="resolution_combobox" tool_tip="Resolución de la imagen">
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_place.xml b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
index 974ab46403..7894d741ff 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_place">
+<panel name="panel_facebook_place">
 	<layout_stack name="stack_place">
 		<layout_panel name="place_detail_panel">
 			<text name="place_caption_label">
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_status.xml b/indra/newview/skins/default/xui/es/panel_facebook_status.xml
index d7c1c33d86..ed31453a39 100644
--- a/indra/newview/skins/default/xui/es/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/es/panel_facebook_status.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_status">
+<panel name="panel_facebook_status">
 	<layout_stack name="stack_status">
 		<layout_panel name="status_detail_panel">
 			<text name="status_caption_label">
diff --git a/indra/newview/skins/default/xui/pl/floater_facebook.xml b/indra/newview/skins/default/xui/pl/floater_facebook.xml
index cabe62e712..571c0bb413 100644
--- a/indra/newview/skins/default/xui/pl/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/pl/floater_facebook.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater name="floater_social" title="Wyślij na Facebooka">
+<floater name="floater_facebook" title="Wyślij na Facebooka">
 	<panel name="background">
 		<tab_container name="tabs">
-			<panel label="Status" name="panel_social_status"/>
-			<panel label="Zdjęcie" name="panel_social_photo"/>
-			<panel label="Miejsce" name="panel_social_place"/>
-			<panel label="Konto" name="panel_social_account"/>
+			<panel label="Status" name="panel_facebook_status"/>
+			<panel label="Zdjęcie" name="panel_facebook_photo"/>
+			<panel label="Miejsce" name="panel_facebook_place"/>
+			<panel label="Konto" name="panel_facebook_account"/>
 		</tab_container>
 		<panel name="connection_status_panel">
 			<text name="connection_error_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_account.xml b/indra/newview/skins/default/xui/pl/panel_facebook_account.xml
index 073ce1bf46..3de93c0079 100644
--- a/indra/newview/skins/default/xui/pl/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_account.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_account">
+<panel name="panel_facebook_account">
 	<string name="facebook_connected" value="Podłączony/a do Facebooka jako:" />
 	<string name="facebook_disconnected" value="Brak połączenia z Facebookiem" />
 	<text name="account_caption_label">
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml b/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
index d59cb93bab..e11db23f30 100644
--- a/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_photo">
+<panel name="panel_facebook_photo">
 	<layout_stack name="stack_photo">
 		<layout_panel name="snapshot_panel">
 			<combo_box name="resolution_combobox" tool_tip="Rozdzielczość obrazka">
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_place.xml b/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
index b1da8558f6..ca3c0b1de3 100644
--- a/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_place">
+<panel name="panel_facebook_place">
 	<layout_stack name="stack_place">
 		<layout_panel name="place_detail_panel">
 			<text name="place_caption_label">
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_status.xml b/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
index 7669ef7525..b5f6fe08b3 100644
--- a/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_social_status">
+<panel name="panel_facebook_status">
 	<layout_stack name="stack_status">
 		<layout_panel name="status_detail_panel">
 			<text name="status_caption_label">