diff --git a/indra/newview/fsfloatersearch.cpp b/indra/newview/fsfloatersearch.cpp
index aff02012a6..be30847172 100644
--- a/indra/newview/fsfloatersearch.cpp
+++ b/indra/newview/fsfloatersearch.cpp
@@ -32,7 +32,6 @@
 #include "fsavatarsearchmenu.h"
 #include "fsdispatchclassifiedclickthrough.h"
 #include "fspanelclassified.h"
-#include "fspanelprofile.h"
 #include "fsscrolllistctrl.h"
 #include "lfsimfeaturehandler.h"
 #include "llagent.h"
@@ -53,6 +52,7 @@
 #include "llloadingindicator.h"
 #include "lllogininstance.h"
 #include "llnotificationsutil.h"
+#include "llpanelprofile.h"
 #include "llpanelprofileclassifieds.h"
 #include "llparcel.h"
 #include "llproductinforequest.h"
@@ -297,7 +297,7 @@ BOOL FSFloaterSearch::postBuild()
 	mPanelWeb			= findChild<FSPanelSearchWeb>("panel_ls_web");
 
 	// <KC> If skin has legacy full profile view, use it
-	mPanelProfile = mPanelPeople->findChild<FSPanelProfile>("panel_profile_view");
+	mPanelProfile = mPanelPeople->findChild<LLPanelProfile>("panel_profile_view");
 	if (mPanelProfile)
 	{
 		mPanelProfile->setVisible(false);
@@ -384,7 +384,7 @@ void FSFloaterSearch::onSelectedItem(const LLUUID& selected_item, ESearchCategor
 					if (mPanelProfile)
 					{
 						mPanelProfile->setVisible(true);
-						mPanelProfile->onOpen(selected_item);
+						mPanelProfile->onOpen(LLSD().with("id", selected_item));
 					}
 					else
 					{
diff --git a/indra/newview/fsfloatersearch.h b/indra/newview/fsfloatersearch.h
index 88baf70468..f195290b21 100644
--- a/indra/newview/fsfloatersearch.h
+++ b/indra/newview/fsfloatersearch.h
@@ -48,7 +48,7 @@ class LLGroupMgrObserver;
 class LLSearchEditor;
 class LLSearchComboBox;
 class FSFloaterSearch;
-class FSPanelProfile;
+class LLPanelProfile;
 class FSScrollListCtrl;
 
 struct SearchQuery : public LLInitParam::Block<SearchQuery>
@@ -406,7 +406,7 @@ private:
 	LLTextureCtrl*	mDetailSnapshot;
 	LLIconCtrl*		mDetailMaturity;
 	LLTabContainer*	mTabContainer;
-	FSPanelProfile*	mPanelProfile;
+	LLPanelProfile*	mPanelProfile;
 };
 
 #endif // FS_FLOATERSEARCH_H
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index b4dc1a8266..a9efdf9dc1 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1575,7 +1575,10 @@ void LLPanelProfileNotes::processProperties(void* data, EAvatarProcessorType typ
         if (avatar_notes && getAvatarId() == avatar_notes->target_id)
         {
             mNotesEditor->setValue(avatar_notes->notes);
-            mNotesEditor->setEnabled(TRUE);
+            // <FS:Ansariel> Don't enable editor in embedded mode since there is no way to save them
+            //mNotesEditor->setEnabled(TRUE);
+            mNotesEditor->setEnabled(!getEmbedded());
+            // </FS:Ansariel>
             updateButtons();
 
             LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
diff --git a/indra/newview/skins/latency/xui/en/panel_fs_search_legacy_people.xml b/indra/newview/skins/latency/xui/en/panel_fs_search_legacy_people.xml
index a6e91c2279..c99bbfd5fd 100644
--- a/indra/newview/skins/latency/xui/en/panel_fs_search_legacy_people.xml
+++ b/indra/newview/skins/latency/xui/en/panel_fs_search_legacy_people.xml
@@ -104,7 +104,7 @@
      width="420"
      follows="top|right|bottom"
      layout="topleft"
-	 class="panel_fs_profile"
+	 class="panel_profile"
     >
         <button
          name="people_profile_btn"
@@ -137,50 +137,50 @@
 		 tab_position="top"
 		 tab_min_width="55">
 			<panel
-			 class="panel_fs_profile_secondlife"
-			 filename="panel_fs_profile_secondlife.xml"
+			 class="panel_profile_secondlife"
+			 filename="panel_profile_secondlife.xml"
 			 label="2nd Life"
 			 layout="topleft"
 			 help_topic="profile_secondlife_tab"
 			 name="panel_profile_secondlife" />
 			<panel
-			 class="panel_fs_profile_web"
-			 filename="panel_fs_profile_web.xml"
+			 class="panel_profile_web"
+			 filename="panel_profile_web.xml"
 			 label="Web"
 			 layout="topleft"
 			 help_topic="profile_web_tab"
 			 name="panel_profile_web" />
 			<panel
-			 class="panel_fs_profile_interests"
-			 filename="panel_fs_profile_interests.xml"
+			 class="panel_profile_interests"
+			 filename="panel_profile_interests.xml"
 			 label="Interests"
 			 layout="topleft"
 			 help_topic="profile_interests_tab"
 			 name="panel_profile_interests" />
 			<panel
-			 class="panel_fs_profile_picks"
-			 filename="panel_fs_profile_picks.xml"
+			 class="panel_profile_picks"
+			 filename="panel_profile_picks.xml"
 			 label="Picks"
 			 layout="topleft"
 			 help_topic="profile_picks_tab"
 			 name="panel_profile_picks" />
 			<panel
-			 class="panel_fs_profile_classified"
-			 filename="panel_fs_profile_classified.xml"
+			 class="panel_profile_classifieds"
+			 filename="panel_profile_classifieds.xml"
 			 label="Classified"
 			 layout="topleft"
 			 help_topic="profile_classified_tab"
-			 name="panel_profile_classified" />
+			 name="panel_profile_classifieds" />
 			<panel
-			 class="panel_fs_profile_firstlife"
-			 filename="panel_fs_profile_firstlife.xml"
+			 class="panel_profile_firstlife"
+			 filename="panel_profile_firstlife.xml"
 			 label="1st Life"
 			 layout="topleft"
 			 help_topic="profile_firstlife_tab"
 			 name="panel_profile_firstlife" />
 			<panel
-			 class="panel_fs_profile_notes"
-			 filename="panel_fsprofile_notes.xml"
+			 class="panel_profile_notes"
+			 filename="panel_profile_notes.xml"
 			 label="Notes"
 			 layout="topleft"
 			 help_topic="profile_notes_tab"