diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 936fbed17d..d8b0d683a3 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -82,7 +82,13 @@ public:
 		
 		FT_INBOX = 49,
 
-		FT_COUNT = 50,
+		// Ansariel: Folder types for our own virtual system folders
+		//FT_COUNT = 50,
+		FT_FIRESTORM = 50,
+		FT_PHOENIX = 51,
+		FT_RLV = 52,
+		FT_COUNT = 53,
+		// END Ansariel: Folder types for our own virtual system folders
 
 		FT_NONE = -1
 	};
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 3fb1986744..c4c522376b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2385,7 +2385,11 @@ LLFolderType::EType LLFolderBridge::getPreferredType() const
 	LLViewerInventoryCategory* cat = getCategory();
 	if(cat)
 	{
-		preferred_type = cat->getPreferredType();
+		std::string catName(cat->getName());
+		if (catName == ROOT_FIRESTORM_FOLDER) preferred_type = LLFolderType::FT_FIRESTORM;
+		else if (catName == RLV_ROOT_FOLDER) preferred_type = LLFolderType::FT_RLV;
+		else if (catName == "#Phoenix") preferred_type = LLFolderType::FT_PHOENIX;
+		else preferred_type = cat->getPreferredType();
 	}
 
 	return preferred_type;
@@ -2398,7 +2402,11 @@ LLUIImagePtr LLFolderBridge::getIcon() const
 	LLViewerInventoryCategory* cat = getCategory();
 	if(cat)
 	{
-		preferred_type = cat->getPreferredType();
+		std::string catName(cat->getName());
+		if (catName == ROOT_FIRESTORM_FOLDER) preferred_type = LLFolderType::FT_FIRESTORM;
+		else if (catName == RLV_ROOT_FOLDER) preferred_type = LLFolderType::FT_RLV;
+		else if (catName == "#Phoenix") preferred_type = LLFolderType::FT_PHOENIX;
+		else preferred_type = cat->getPreferredType();
 	}
 	return getIcon(preferred_type);
 }
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 05fbb98b1a..d9609335a9 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -130,6 +130,10 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 		 
 	addEntry(LLFolderType::FT_NONE, 				new ViewerFolderEntry("New Folder",				"Inv_FolderOpen",		"Inv_FolderClosed",		FALSE, "default"));
 
+	addEntry(LLFolderType::FT_FIRESTORM, 			new ViewerFolderEntry("Firestorm",				"Inv_FirestormOpen",	"Inv_FirestormClosed",		FALSE, "default"));
+	addEntry(LLFolderType::FT_PHOENIX, 				new ViewerFolderEntry("Phoenix",				"Inv_PhoenixOpen",		"Inv_PhoenixClosed",		FALSE, "default"));
+	addEntry(LLFolderType::FT_RLV,					new ViewerFolderEntry("RLV",					"Inv_RLVOpen",			"Inv_RLVClosed",		FALSE, "default"));
+
 #if SUPPORT_ENSEMBLES
 	initEnsemblesFromFile();
 #else
diff --git a/indra/newview/skins/default/textures/legacy/inv_folder_firestorm.tga b/indra/newview/skins/default/textures/legacy/inv_folder_firestorm.tga
new file mode 100644
index 0000000000..c578e2404a
Binary files /dev/null and b/indra/newview/skins/default/textures/legacy/inv_folder_firestorm.tga differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 23875775f4..b8e835e81e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -264,6 +264,14 @@ with the same filename but different name
   <texture name="Inv_InboxOpen"			file_name="icons/Inv_SysOpen.png" />
   <texture name="Inv_InboxClosed"		file_name="icons/Inv_SysClosed.png" />
   
+ <!-- Firstorm virtual system folders -->
+  <texture name="Inv_FirestormOpen"		file_name="icons/Inv_SysOpen.png" />
+  <texture name="Inv_FirestormClosed"	file_name="icons/Inv_SysClosed.png" />
+  <texture name="Inv_PhoenixOpen"		file_name="icons/Inv_SysOpen.png" />
+  <texture name="Inv_PhoenixClosed"		file_name="icons/Inv_SysClosed.png" />
+  <texture name="Inv_RLVOpen"			file_name="icons/Inv_SysOpen.png" />
+  <texture name="Inv_RLVClosed"			file_name="icons/Inv_SysClosed.png" />
+  
   <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
   <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
 
diff --git a/indra/newview/skins/firestorm/textures/textures.xml b/indra/newview/skins/firestorm/textures/textures.xml
index 72611bc95d..11aa774098 100644
--- a/indra/newview/skins/firestorm/textures/textures.xml
+++ b/indra/newview/skins/firestorm/textures/textures.xml
@@ -70,6 +70,14 @@
 	<texture name="Inv_FolderClosed"		file_name="legacy/inv_folder_plain_closed.tga" />
 	<texture name="Inv_FolderOpen"			file_name="legacy/inv_folder_plain_open.tga" />
 
+	<!-- Firstorm virtual system folders -->
+	<texture name="Inv_FirestormOpen"		file_name="legacy/inv_folder_firestorm.tga" />
+	<texture name="Inv_FirestormClosed"		file_name="legacy/inv_folder_firestorm.tga" />
+	<texture name="Inv_PhoenixOpen"			file_name="legacy/inv_folder_phoenix.tga" />
+	<texture name="Inv_PhoenixClosed"		file_name="legacy/inv_folder_phoenix.tga" />
+	<texture name="Inv_RLVOpen"			file_name="legacy/inv_folder_RLVa.tga" />
+	<texture name="Inv_RLVClosed"			file_name="legacy/inv_folder_RLVa.tga" />
+
 	<texture name="Parcel_Build_Dark"		file_name="legacy/status_build.png" />
 	<texture name="Parcel_BuildNo_Dark"		file_name="legacy/status_no_build.tga" />
 	<texture name="Parcel_Damage_Dark"		file_name="icons/Parcel_Damage_Dark.png" />
diff --git a/indra/newview/skins/firestormsidetabs/textures/textures.xml b/indra/newview/skins/firestormsidetabs/textures/textures.xml
index 877c2c7d99..0c978cf77e 100644
--- a/indra/newview/skins/firestormsidetabs/textures/textures.xml
+++ b/indra/newview/skins/firestormsidetabs/textures/textures.xml
@@ -70,6 +70,14 @@
 	<texture name="Inv_FolderClosed"		file_name="legacy/inv_folder_plain_closed.tga" />
 	<texture name="Inv_FolderOpen"			file_name="legacy/inv_folder_plain_open.tga" />
 
+	<!-- Firstorm virtual system folders -->
+	<texture name="Inv_FirestormOpen"		file_name="legacy/inv_folder_firestorm.tga" />
+	<texture name="Inv_FirestormClosed"		file_name="legacy/inv_folder_firestorm.tga" />
+	<texture name="Inv_PhoenixOpen"			file_name="legacy/inv_folder_phoenix.tga" />
+	<texture name="Inv_PhoenixClosed"		file_name="legacy/inv_folder_phoenix.tga" />
+	<texture name="Inv_RLVOpen"			file_name="legacy/inv_folder_RLVa.tga" />
+	<texture name="Inv_RLVClosed"			file_name="legacy/inv_folder_RLVa.tga" />
+
 	<texture name="Parcel_Build_Dark"		file_name="legacy/status_build.png" />
 	<texture name="Parcel_BuildNo_Dark"		file_name="legacy/status_no_build.tga" />
 	<texture name="Parcel_Damage_Dark"		file_name="icons/Parcel_Damage_Dark.png" />