diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7cfe286518..ae711ed4d2 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16556,5 +16556,27 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSContactSetsNotificationToast</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the On/Offline notifications caused by Contactsets as Toast message</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>FSContactSetsNotificationNearbyChat</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the On/Offline notifications caused by Contactsets in Nearby Chat</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
 </map>
 </llsd>
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 22cf12a3b7..30b2afa499 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -818,7 +818,17 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 	LLIMModel::instance().proccessOnlineOfflineNotification(session_id, notify_msg);
 	// If desired, also send it to nearby chat, this allows friends'
 	// online/offline times to be referenced in chat & logged.
-	if (gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")||LGGContactSets::getInstance()->notifyForFriend(agent_id)) 
+	// [FIRE-3522 : SJ] Only show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Toasts
+	if (gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) 
+	{
+		LLChat chat;
+		chat.mText = notify_msg;
+		chat.mSourceType = CHAT_SOURCE_SYSTEM;
+		args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
+		LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
+	}
+	// [FIRE-3522 : SJ] show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
+	if (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)) 
 	{
 		LLChat chat;
 		chat.mText = notify_msg;
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index d826eea13b..9b8a3d9ceb 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -133,7 +133,8 @@ bool LLTipHandler::processNotification(const LLSD& notify)
 		// [FIRE-3522 : SJ] Only show Online/Offline toast when ChatOnlineNotification is enabled or the Friend is one you want to have on/offline notices from
 		if (!gSavedSettings.getBOOL("ChatOnlineNotification") && ("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName()))
 		{
-			if (!LGGContactSets::getInstance()->notifyForFriend(agent_id) )
+			// [FIRE-3522 : SJ] Only show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Toasts
+			if (!(gSavedSettings.getBOOL("FSContactSetsNotificationToast") && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
 			{
 				return false;
 			}
diff --git a/indra/newview/skins/default/xui/en/floater_contactsets_settings.xml b/indra/newview/skins/default/xui/en/floater_contactsets_settings.xml
index 9c292c17dc..580cdc030d 100644
--- a/indra/newview/skins/default/xui/en/floater_contactsets_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_contactsets_settings.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" can_close="true" can_minimize="true" bottom="400" left="300" can_resize="false" height="310" width="470" name="lgg_fg_floater_settings" title="Contact Sets Settings" help_topic="fs_contact_sets">
+<floater border="true" can_close="true" can_minimize="true" bottom="400" left="300" can_resize="false" height="370" width="550" name="lgg_fg_floater_settings" title="Contact Sets Settings" help_topic="fs_contact_sets">
   <color_swatch bottom_delta="50" can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top" height="40" label="" left_delta="5" mouse_opaque="true" name="colordefault" tool_tip="Default color for friends not in a group. Affects only the FriendGroups list display." width="65" control_name="lgg_fg_groupColor"/>
   <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="10" left_delta="70" name="lgg_fg_text2a" width="110">Default color for</text>
   <text bottom_delta="11" follows="left|top" font="SansSerifSmall" height="10" left_delta="0" name="lgg_fg_text2b" width="120">friends not in a Set</text>
   <slider can_edit_text="false" control_name="FSContactSetsScrollSpeed" decimal_digits="0" follows="left|top" height="15" increment="1" initial_value="100" layout="topleft" left_delta="150" max_val="100" min_val="1" name="FSContactSetsScrollSpeed" bottom_delta="0" width="250" label="Scroll speed" label_width="80" tool_tip="How fast to scroll through the list."/>
-  <check_box bottom_delta="30" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show Online Notices for ALL friends (set to false to only show for certain Sets)" left="5" mouse_opaque="true" name="ChatOnlineNotification" visible="true" radio_style="false" width="270" control_name="ChatOnlineNotification"/>
+  <check_box bottom_delta="30" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show Online Notices for ALL friends as toasts (set to false to only show for certain Sets)" left="5" mouse_opaque="true" name="ChatOnlineNotification" visible="true" radio_style="false" width="270" control_name="ChatOnlineNotification"/>
+  <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show Online Notices for ALL friends in nearby chat (set to false to only show for certain Sets)" left="5" mouse_opaque="true" name="OnlineOfflinetoNearbyChat" visible="true" radio_style="false" width="270" control_name="OnlineOfflinetoNearbyChat"/>
+  <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show Online Notices for certain Sets as toast" left="5" mouse_opaque="true" name="FSContactSetsNotificationToast" visible="true" radio_style="false" width="270" control_name="FSContactSetsNotificationToast"/>
+  <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show Online Notices for certain Sets in nearby chat" left="5" mouse_opaque="true" name="FSContactSetsNotificationNearbyChat" visible="true" radio_style="false" width="270" control_name="FSContactSetsNotificationNearbyChat"/>
   <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Color a friend's mini map icon based on their Contact Set" left="5" mouse_opaque="true" name="FSContactSetsColorizeMiniMap" visible="true" radio_style="false" width="270" control_name="FSContactSetsColorizeMiniMap"/>
   <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Color a friend's name tag based on their Contact Set" left="5" mouse_opaque="true" name="FSContactSetsColorizeNameTag" visible="true" radio_style="false" width="270" control_name="FSContactSetsColorizeNameTag"/>
   <check_box bottom_delta="15" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Color a friend's radar list entry based on their Contact Set" left="5" mouse_opaque="true" name="FSContactSetsColorizeRadar" visible="true" radio_style="false" width="270" control_name="FSContactSetsColorizeRadar"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 3d3ccfc0bb..66b2db0e66 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -32,11 +32,20 @@
     <check_box
      control_name="ChatOnlineNotification"
      height="16"
-     label="When my friends log in or out"
+     label="When my friends log in or out  as toasts"
      layout="topleft"
      left_delta="0"
      name="friends_online_notify_checkbox"
      top_pad="4"
+     width="300" />
+	     <check_box
+     control_name="OnlineOfflinetoNearbyChat"
+     height="16"
+     label="When my friends log in or out in nearby chat"
+     layout="topleft"
+     left_delta="0"
+     name="OnlineOfflinetoNearbyChat"
+     top_pad="4"
      width="300" />
     <check_box
      control_name="ShowScriptErrors"
@@ -90,7 +99,7 @@
     </text>
     <scroll_list
      follows="top|left|right"
-     height="140"
+     height="120"
      layout="topleft"
      left="10"
      multi_select="true"
@@ -140,7 +149,7 @@
     </text>
     <scroll_list
      follows="top|left|right"
-     height="140"
+     height="120"
      layout="topleft"
      left="10"
      sort_column="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 4361dcefd1..3ca0fc7d18 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -925,6 +925,8 @@
  			 left="30"
              height="18"
              width="400" />
+			 <!--SJ: Moved OnlineOfflinetoNearbyChat to Dialogs preference-->
+			 <!--
             <check_box
              control_name="OnlineOfflinetoNearbyChat"
              name="OnlineOfflinetoNearbyChat"
@@ -933,6 +935,7 @@
              top_pad="0"
              height="18"
              width="400" />
+			 -->
             <check_box
              control_name="ShowStreamMetadata"
              name="ShowStreamMetadata"