diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 7241b3c0c28631f2d838981fd8be2e8f9dd9a73f..27bb4058a0120e39d1e84e9c88115ad6da38dd1a 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -102,6 +102,9 @@ LLFolderDictionary::LLFolderDictionary()
 		 
     addEntry(LLFolderType::FT_SETTINGS,             new FolderEntry("settings", TRUE));
 
+	addEntry(LLFolderType::FT_SUITCASE, new FolderEntry("suitcase", TRUE));
+    addEntry(LLFolderType::FT_ANIM_OVERRIDES, new FolderEntry("animover", TRUE));
+
 	addEntry(LLFolderType::FT_NONE, 				new FolderEntry("-1",		FALSE));
 };
 
diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h
index 85b86f9ce5452fe2be1a642233cd58703c9bbf84..2367b9bfddf2e3f6005c163a281be6f4dbe8eabe 100644
--- a/indra/llinventory/llfoldertype.h
+++ b/indra/llinventory/llfoldertype.h
@@ -32,7 +32,7 @@
 
 // This class handles folder types (similar to assettype, except for folders)
 // and operations on those.
-class LL_COMMON_API LLFolderType
+class LLFolderType
 {
 public:
 	// ! BACKWARDS COMPATIBILITY ! Folder type enums must match asset type enums.
@@ -93,6 +93,11 @@ class LL_COMMON_API LLFolderType
 
         FT_SETTINGS = 56,
 
+		FT_SUITCASE = 100,
+
+		FT_ANIM_OVERRIDES,
+		FT_TOXIC,
+
 		FT_COUNT,
 
 		FT_NONE = -1
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index afa84a5afc15a3b3b09fff993e6a72a306d15bad..0efae1e38a4997906d84bec14394c05f89e72331 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -144,8 +144,11 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new ViewerFolderEntry("Marketplace Listings",   "Inv_SysOpen",			"Inv_SysClosed",		FALSE,     boxes_invisible));
 	addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new ViewerFolderEntry("New Stock",              "Inv_StockFolderOpen",	"Inv_StockFolderClosed",		FALSE,     false, "default"));
 	addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new ViewerFolderEntry("New Version",            "Inv_VersionFolderOpen","Inv_VersionFolderClosed",		FALSE,     false, "default"));
+	addEntry(LLFolderType::FT_SUITCASE,				new ViewerFolderEntry("My Suitcase",			"Inv_SysOpen", "Inv_SysClosed",							FALSE,		false));
+	addEntry(LLFolderType::FT_ANIM_OVERRIDES,		new ViewerFolderEntry("Animation Overrides",	"Inv_SysOpen",			"Inv_SysClosed",		FALSE,	false));
 
 	addEntry(LLFolderType::FT_NONE, 				new ViewerFolderEntry("New Folder",				"Inv_FolderOpen",		"Inv_FolderClosed",		FALSE,     false, "default"));
+	addEntry(LLFolderType::FT_TOXIC, 			new ViewerFolderEntry("Firstorm",				"Inv_FolderOpenToxic",		"Inv_FolderClosedToxic",		FALSE,     false));
 
 	for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type)
 	{
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png b/indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf2e5542ef8f86dc61b888181faa19d2e3342ef
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_FolderClosedToxic.png differ
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png b/indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..8627b689f2ff62186456891e02db6d422df06d9c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_FolderOpenToxic.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9b9ea093beee39c360fe1563501fbce752fd42d7..b12246d97e60c4be950885298e999d867e3f6d89 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -294,7 +294,9 @@ with the same filename but different name
   <texture name="Inv_Clothing" file_name="icons/Inv_Clothing.png" preload="false" />
   <texture name="Inv_Eye" file_name="icons/Inv_Eye.png" preload="false" />
   <texture name="Inv_FolderClosed" file_name="icons/Inv_FolderClosed.png" preload="false" />
+  <texture name="Inv_FolderClosedToxic" file_name="icons/Inv_FolderClosedToxic.png" preload="false" />
   <texture name="Inv_FolderOpen" file_name="icons/Inv_FolderOpen.png" preload="false" />
+  <texture name="Inv_FolderOpenToxic" file_name="icons/Inv_FolderOpenToxic.png" preload="false" />
   <texture name="Inv_Gesture" file_name="icons/Inv_Gesture.png" preload="false" />
   <texture name="Inv_Gloves" file_name="icons/Inv_Gloves.png" preload="false" />
   <texture name="Inv_Hair" file_name="icons/Inv_Hair.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fcff4499c5c880016ba941500f0185e6a759e67a..f400a07921a8b3619def9e7af48b80773a09517c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2425,6 +2425,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="Since Logoff"  value=" - Since Logoff" />
 
 	<!-- inventory folder -->
+	<string name="InvFolder Basic Root">Basic Root</string>
 	<string name="InvFolder My Inventory">My Inventory</string>
 	<string name="InvFolder Library">Library</string>
 	<string name="InvFolder Textures">Textures</string>
@@ -2459,6 +2460,8 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Meshes">Meshes</string>
 	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
+	<string name="InvFolder Animation Overrides">Animation Overrides</string>
+	<string name="InvFolder #Firestorm">#Firestorm</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>