diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 226ab7769..5f30bcf94 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1842,7 +1842,7 @@ void LLIMProcessing::processNewMessage(const LLUUID& from_id,
 			strings.push_back(from_id.asString());
 			send_generic_message("requestonlinenotification", strings);
 			
-			args["NAME"] = name;
+			args["NAME"] = LLAvatarActions::getSLURL(from_id);
 			LLSD payload;
 			payload["from_id"] = from_id;
 			LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback, _1, _2, "FriendshipAccepted", args, payload));
diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp
index 6866643ec..17a6b28ef 100644
--- a/indra/newview/llnotify.cpp
+++ b/indra/newview/llnotify.cpp
@@ -224,7 +224,9 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
 		if (!mIsCaution || !mIsTip) // We could do some extra color math here to determine if bg's too close to link color, but let's just cross with the link color instead
 			mText->setLinkColor(new LLColor4(lerp(text_color, gSavedSettings.getColor4("HTMLLinkColor"), 0.4f)));
 		mText->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
-		mText->appendText(message,false,false,style,!layout_script_dialog); // Now we can set the text, since colors have been set.
+		mText->appendText(message,false,false,style); // Now we can set the text, since colors have been set.
+		if (is_textbox || layout_script_dialog)
+			mText->appendText(notification->getSubstitutions()["SCRIPT_MESSAGE"], false, true, style, false);
 		addChild(mText);
 	}
 
diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp
index 00993d1ec..d27393d25 100644
--- a/indra/newview/llpanelexperiencepicker.cpp
+++ b/indra/newview/llpanelexperiencepicker.cpp
@@ -32,6 +32,7 @@
 
 #include "lllineeditor.h"
 #include "llfloaterexperienceprofile.h"
+#include "llfloaterexperiences.h"
 //#include "llfloaterreg.h"
 #include "lluictrlfactory.h"
 #include "llscrolllistctrl.h"
@@ -62,13 +63,12 @@ const static std::string columnSpace = " ";
 /* Singu Note: We do not have injectors, so we'll have to call this function instead
 static LLPanelInjector<LLPanelExperiencePicker> t_panel_status("llpanelexperiencepicker");
 */
-void* create_xp_picker(void* data) { return new LLPanelExperiencePicker(false); }
 
-LLPanelExperiencePicker::LLPanelExperiencePicker(bool build)
+LLPanelExperiencePicker::LLPanelExperiencePicker()
 	:LLPanel()
 {
 	//buildFromFile("panel_experience_search.xml");
-	if (build) LLUICtrlFactory::getInstance()->buildPanel(this, "panel_experience_search.xml"); // Singu Note: Use filename in xml
+	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_experience_search.xml"); // Singu Note: Use filename in xml
 	setDefaultFilters();
 }
 
@@ -288,7 +288,7 @@ void LLPanelExperiencePicker::onBtnSelect()
 
 void LLPanelExperiencePicker::onBtnClose()
 {
-	LLFloater* floater = static_cast<LLFloater*>(getParent());
+	LLFloater* floater = mSelectionCallback ? static_cast<LLFloater*>(getParent()) : LLFloaterExperiences::findInstance();
 	if (floater)
 	{
 		floater->close();
diff --git a/indra/newview/llpanelexperiencepicker.h b/indra/newview/llpanelexperiencepicker.h
index ba3e5d299..1af7fe108 100644
--- a/indra/newview/llpanelexperiencepicker.h
+++ b/indra/newview/llpanelexperiencepicker.h
@@ -32,7 +32,6 @@
 class LLScrollListCtrl;
 class LLLineEditor;
 
-void* create_xp_picker(void* data);
 class LLPanelExperiencePicker final : public LLPanel
 {
 public:
@@ -44,7 +43,7 @@ public:
 	typedef std::function<bool (const LLSD&)> filter_function;
 	typedef std::vector<filter_function> filter_list;
 
-	LLPanelExperiencePicker(bool build = true);
+	LLPanelExperiencePicker();
 	virtual ~LLPanelExperiencePicker();
 
 	BOOL postBuild() override;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e18c66c84..2a0758ba4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -7020,7 +7020,8 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
 	LLSD args;
 	args["TITLE"] = object_name;
-	args["MESSAGE"] = message;
+	args["MESSAGE"] = LLStringUtil::null;
+	args["SCRIPT_MESSAGE"] = message;
 	args["CHANNEL"] = chat_channel;
 	LLNotificationPtr notification;
 	char const* name = (is_group && !is_text_box) ? "GROUPNAME" : "NAME";
diff --git a/indra/newview/skins/default/xui/en-us/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en-us/floater_experienceprofile.xml
index e531d21ab..2a043b5f0 100644
--- a/indra/newview/skins/default/xui/en-us/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_experienceprofile.xml
@@ -64,7 +64,6 @@
         height="530"
         left="0"
         name="xp_scroll"
-        opaque="true"
         bottom="0"
         width="348">
         <panel
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 53bfad2b9..101dbabcf 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7862,7 +7862,7 @@ Offer a teleport?
    icon="notify.tga"
    name="FriendshipAccepted"
    log_to_im="true"   
-   type="notify">
+   type="notifytip">
     <tag>friendship</tag>
 [NAME] accepted your friendship offer.
   </notification>
@@ -7872,7 +7872,7 @@ Offer a teleport?
    name="FriendshipDeclined"
    log_to_im="true"   
    persist="true"
-   type="notify">
+   type="notifytip">
     <tag>friendship</tag>
 [NAME] declined your friendship offer.
   </notification>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index d141ac555..2d8e0d1e2 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -3386,11 +3386,11 @@ L'objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(
 	</notification>
 
 	<notification name="FriendshipAccepted">
-[NAME_SLURL] a accepté votre amitié. [MESSAGE]
+[NAME] a accepté votre amitié.
 	</notification>
 
 	<notification name="FriendshipDeclined">
-[NAME_SLURL] a refusé votre amitié. [MESSAGE]
+[NAME] a refusé votre amitié.
 	</notification>
 
 	<notification name="OfferCallingCard">