diff --git a/indra/newview/skins/default/xui/de/panel_notes.xml b/indra/newview/skins/default/xui/de/panel_notes.xml
index ef1961b63d..6ea1f63188 100644
--- a/indra/newview/skins/default/xui/de/panel_notes.xml
+++ b/indra/newview/skins/default/xui/de/panel_notes.xml
@@ -1,35 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notizen &amp; Privatsphäre" name="panel_notes">
-	<layout_stack name="layout">
-		<layout_panel name="notes_stack">
-			<scroll_container name="profile_scroll">
-				<panel name="profile_scroll_panel">
-					<text name="status_message" value="Meine Notizen:"/>
-					<text name="status_message2" value="Diese Person kann:"/>
-					<check_box label="meinen Online-Status sehen." name="status_check"/>
-					<check_box label="mich auf der Karte sehen." name="map_check"/>
-					<check_box label="meine Objekte bearbeiten, löschen oder nehmen." name="objects_check"/>
-				</panel>
-			</scroll_container>
-		</layout_panel>
-		<layout_panel name="notes_buttons_panel">
-			<layout_stack name="bottom_bar_ls">
-				<layout_panel name="add_friend_btn_lp">
-					<button label="Freund hinzufügen" name="add_friend" tool_tip="Dem Einwohner die Freundschaft anbieten"/>
-				</layout_panel>
-				<layout_panel name="im_btn_lp">
-					<button label="IM" name="im" tool_tip="Instant Messenger öffnen"/>
-				</layout_panel>
-				<layout_panel name="call_btn_lp">
-					<button label="Anrufen" name="call" tool_tip="Diesen Einwohner anrufen"/>
-				</layout_panel>
-				<layout_panel name="show_on_map_btn_lp">
-					<button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen"/>
-				</layout_panel>
-				<layout_panel name="teleport_btn_lp">
-					<button label="Teleportieren" name="teleport" tool_tip="Teleport anbieten"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
+	<text name="status_message" value="Meine Notizen:"/>
+	<text name="status_message2" value="Diese Person kann:"/>
+	<check_box label="meinen Online-Status sehen." name="status_check"/>
+	<check_box label="mich auf der Karte sehen." name="map_check"/>
+	<check_box label="meine Objekte bearbeiten, löschen oder nehmen." name="objects_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml
new file mode 100644
index 0000000000..27efe86f7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_firstlife.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_profile_firstlife">
+          <panel name="first_life_panel">
+            <text name="homepage_text" value="Webseite:" />
+            <text name="homepage_edit" value="keine"/>
+          </panel>
+</panel>
+
diff --git a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..9a6d7596e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_profile">
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=de
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=de
+    </string>
+    <string
+     name="no_partner_text"
+     value="Kein Partner" />
+    <string
+     name="no_group_text"
+     value="Keine" />
+
+          <panel name="second_life_panel">
+            <text name="Name:" value="Name:" />
+            <text_editor name="complete_name" value="(laden)" />
+            <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
+            <text name="status" value="Online"/>
+            <text name="Key:" value="UUID:" />
+            <text_editor name="user_key" value="(laden)" />
+            <text name="label" value="Geboren am:" />
+            <text name="label2" value="Konto:" />
+            <text name="partner_label" value="Partner:" />
+            <text name="About:" value="Info:" left="9" />
+            <view_border left_pad="3" name="info_border" />
+            <text name="Groups:" value="Gruppen:" left="9"/>
+            <group_list left_pad="3" name="group_list" />
+
+            <layout_stack>
+				<layout_panel name="left_buttonstack">
+					<button label="Zeige auf Karte" label_selected="Zeige auf Karte" name="show_on_map_btn" tool_tip="Zeige Position des Einwohners auf der Karte."/>
+					<button label="Zahlen" label_selected="Zahlen" name="pay" tool_tip="Zahle Geld oder teile Objekte mit diesem Einwohner."/>
+				</layout_panel>
+
+				<layout_panel name="middle_buttonstack">
+					<button label="Teleport anbieten" label_selected="Teleport anbieten" name="teleport" tool_tip="Diesem Einwohner einen Teleport anbieten."/>
+					<button label="Instant Message" label_selected="Instant Message" name="im" tool_tip="Instant-Message-Session mit diesem Einwohner beginnen."/>
+				</layout_panel>
+				
+				<layout_panel name="right_buttonstack">
+					<button label="Freund hinzufügen" label_selected="Freund hinzufügen" name="add_friend" tool_tip="Diesem Einwohner deine Freundschaft anbieten."/>
+					<button label="Blockieren" name="block" tool_tip="Diesen Einwohner blockieren."/>
+					<button label="Freigeben" name="unblock" tool_tip="Diesen Einwohner nicht mehr blockieren."/>
+				</layout_panel>
+            </layout_stack>
+
+          </panel>
+</panel>
+
diff --git a/indra/newview/skins/default/xui/de/panel_profile_view.xml b/indra/newview/skins/default/xui/de/panel_profile_view.xml
index 7e93bd1ede..cd287d8e24 100644
--- a/indra/newview/skins/default/xui/de/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile_view.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_target_profile">
+<panel name="panel_target_profile" label="Profil">
 	<string name="status_online">
 		Online
 	</string>
 	<string name="status_offline">
 		Offline
 	</string>
-	<text name="display_name_label" value="Anzeigename:"/>
-	<text name="solo_username_label" value="Benutzername:"/>
-	<text name="status" value="Online"/>
-	<text name="user_name_small" value="Dieser Name ist ein ganz außerordentlich langer Name"/>
-	<button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
-	<text name="user_label" value="Benutzername:"/>
 	<tab_container name="tabs" tab_min_width="60">
 		<panel label="PROFIL" name="panel_profile"/>
 		<panel label="AUSWAHL" name="panel_picks"/>
+		<panel label="ECHTES LEBEN" name="panel_profile_firstlife"/>
 		<panel label="NOTIZEN &amp; PRIVATSPHÄRE" name="panel_notes"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_profile_view.xml b/indra/newview/skins/default/xui/en/floater_profile_view.xml
index 383b35e989..0da679fb6d 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_view.xml
@@ -3,6 +3,8 @@
  height="470"
  layout="topleft"
  width="420"
+ min_height="490"
+ min_width="420"
  can_close="true"
  can_resize="true">
     <panel
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index a4ab76d09e..e1ec2224fc 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -321,6 +321,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              height="44">
 
             <layout_panel
+			 name="left_buttonstack"
              left="2"
              right="-2"
              height="42"
@@ -336,6 +337,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Find on Map"
              label_selected="Find on Map"
              name="show_on_map_btn"
+			 tool_tip="Locate the Resident on the map"
              follows="left|top|right" />
 
             <button
@@ -350,6 +352,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="middle_buttonstack"
              left="2"
              right="-2"
              user_resize="false"
@@ -364,6 +367,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Offer Teleport"
              label_selected="Offer Teleport"
              name="teleport"
+			 tool_tip="Offer a teleport to the Resident"
              follows="left|top|right" />
 
             <button
@@ -378,6 +382,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="right_buttonstack"
              left="2"
              right="-2"
              user_resize="false"
diff --git a/indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..c1fd065efe
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/de/panel_profile_secondlife.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_profile">
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=de
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=de
+    </string>
+    <string
+     name="no_partner_text"
+     value="Kein Partner" />
+    <string
+     name="no_group_text"
+     value="Keine" />
+	 
+          <panel name="second_life_panel">
+
+            <text name="Key:" value="UUID:"/>
+            <text_editor name="user_key" value="(laden)"/>
+            <button name="copy_uri" label="URI kopieren"/>
+            <text name="Name:" value="Name:"/>
+            <text_editor name="complete_name" value="(laden)"/>
+            <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
+            <text name="status" value="Online"/>
+            <text name="label" value="Geboren am:"/>
+            <text name="label2" value="Konto:"/>
+            <text name="partner_label" value="Partner:"/>
+            <text left="9" name="Groups:" value="Gruppen:"/>
+            <group_list left_pad="3" name="group_list"/>
+            <text left="9" name="About:" value="Info:"/>
+            <view_border left_pad="3" name="info_border"/>
+
+            <layout_stack>
+				<layout_panel name="left_buttonstack">
+					<button label="Zeige auf Karte" label_selected="Zeige auf Karte" name="show_on_map_btn" tool_tip="Zeige Position des Einwohners auf der Karte."/>
+					<button label="Zahlen" label_selected="Zahlen" name="pay" tool_tip="Zahle Geld oder teile Objekte mit diesem Einwohner."/>
+				</layout_panel>
+
+				<layout_panel name="middle_buttonstack">
+					<button label="Teleport anbieten" label_selected="Teleport anbieten" name="teleport" tool_tip="Diesem Einwohner einen Teleport anbieten."/>
+					<button label="Instant Message" label_selected="Instant Message" name="im" tool_tip="Instant-Message-Session mit diesem Einwohner beginnen."/>
+				</layout_panel>
+				
+				<layout_panel name="right_buttonstack">
+					<button label="Freund hinzufügen" label_selected="Freund hinzufügen" name="add_friend" tool_tip="Diesem Einwohner deine Freundschaft anbieten."/>
+					<button label="Blockieren" name="block" tool_tip="Diesen Einwohner blockieren."/>
+					<button label="Freigeben" name="unblock" tool_tip="Diesen Einwohner nicht mehr blockieren."/>
+				</layout_panel>
+            </layout_stack>
+
+          </panel>
+</panel>
+
diff --git a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
index 6157d59168..53b04a097a 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_profile_secondlife.xml
@@ -328,6 +328,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              height="44">
 
             <layout_panel
+			 name="left_buttonstack"
              left="2"
              right="-2"
              height="42"
@@ -343,6 +344,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Find on Map"
              label_selected="Find on Map"
              name="show_on_map_btn"
+			 tool_tip="Locate the Resident on the map"
              follows="left|top|right" />
 
             <button
@@ -357,6 +359,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="middle_buttonstack"
              left="2"
              right="-2"
              user_resize="false"
@@ -371,6 +374,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Offer Teleport"
              label_selected="Offer Teleport"
              name="teleport"
+			 tool_tip="Offer a teleport to the Resident"
              follows="left|top|right" />
 
             <button
@@ -385,6 +389,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="right_buttonstack"
              left="2"
              right="-2"
              user_resize="false"
diff --git a/indra/newview/skins/firestormsidetabs/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/firestormsidetabs/xui/de/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..c1fd065efe
--- /dev/null
+++ b/indra/newview/skins/firestormsidetabs/xui/de/panel_profile_secondlife.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_profile">
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=de
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=de
+    </string>
+    <string
+     name="no_partner_text"
+     value="Kein Partner" />
+    <string
+     name="no_group_text"
+     value="Keine" />
+	 
+          <panel name="second_life_panel">
+
+            <text name="Key:" value="UUID:"/>
+            <text_editor name="user_key" value="(laden)"/>
+            <button name="copy_uri" label="URI kopieren"/>
+            <text name="Name:" value="Name:"/>
+            <text_editor name="complete_name" value="(laden)"/>
+            <button name="copy_to_clipboard" tool_tip="In Zwischenablage kopieren"/>
+            <text name="status" value="Online"/>
+            <text name="label" value="Geboren am:"/>
+            <text name="label2" value="Konto:"/>
+            <text name="partner_label" value="Partner:"/>
+            <text left="9" name="Groups:" value="Gruppen:"/>
+            <group_list left_pad="3" name="group_list"/>
+            <text left="9" name="About:" value="Info:"/>
+            <view_border left_pad="3" name="info_border"/>
+
+            <layout_stack>
+				<layout_panel name="left_buttonstack">
+					<button label="Zeige auf Karte" label_selected="Zeige auf Karte" name="show_on_map_btn" tool_tip="Zeige Position des Einwohners auf der Karte."/>
+					<button label="Zahlen" label_selected="Zahlen" name="pay" tool_tip="Zahle Geld oder teile Objekte mit diesem Einwohner."/>
+				</layout_panel>
+
+				<layout_panel name="middle_buttonstack">
+					<button label="Teleport anbieten" label_selected="Teleport anbieten" name="teleport" tool_tip="Diesem Einwohner einen Teleport anbieten."/>
+					<button label="Instant Message" label_selected="Instant Message" name="im" tool_tip="Instant-Message-Session mit diesem Einwohner beginnen."/>
+				</layout_panel>
+				
+				<layout_panel name="right_buttonstack">
+					<button label="Freund hinzufügen" label_selected="Freund hinzufügen" name="add_friend" tool_tip="Diesem Einwohner deine Freundschaft anbieten."/>
+					<button label="Blockieren" name="block" tool_tip="Diesen Einwohner blockieren."/>
+					<button label="Freigeben" name="unblock" tool_tip="Diesen Einwohner nicht mehr blockieren."/>
+				</layout_panel>
+            </layout_stack>
+
+          </panel>
+</panel>
+
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
index 6157d59168..53b04a097a 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_profile_secondlife.xml
@@ -328,6 +328,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              height="44">
 
             <layout_panel
+			 name="left_buttonstack"
              left="2"
              right="-2"
              height="42"
@@ -343,6 +344,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Find on Map"
              label_selected="Find on Map"
              name="show_on_map_btn"
+			 tool_tip="Locate the Resident on the map"
              follows="left|top|right" />
 
             <button
@@ -357,6 +359,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="middle_buttonstack"
              left="2"
              right="-2"
              user_resize="false"
@@ -371,6 +374,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
              label="Offer Teleport"
              label_selected="Offer Teleport"
              name="teleport"
+			 tool_tip="Offer a teleport to the Resident"
              follows="left|top|right" />
 
             <button
@@ -385,6 +389,7 @@ KC: I used view_border's around text_editor's due to text render issues with bor
 
             </layout_panel>
             <layout_panel
+			 name="right_buttonstack"
              left="2"
              right="-2"
              user_resize="false"