diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 16f0bc8b40..5a47a9186d 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -948,9 +948,14 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 void LLFolderViewItem::draw()
 {
-	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
-	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
-	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	// <FS:Ansariel> Make inventory selection color independent from menu color
+	//static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
+	//static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
+	//static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
+	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("InventoryItemEnabledColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("InventoryItemHighlightBgColor", DEFAULT_WHITE);
+	static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("InventoryItemHighlightFgColor", DEFAULT_WHITE);
+	// <FS:Ansariel> Make inventory selection color independent from menu color
 	static LLUIColor sFocusOutlineColor = LLUIColorTable::instance().getColor("InventoryFocusOutlineColor", DEFAULT_WHITE);
 	static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
 	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e82153d57d..e545c4ae5b 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -658,6 +658,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/firestorm/colors.xml b/indra/newview/skins/firestorm/colors.xml
index 3f7679242f..185a9d10f2 100644
--- a/indra/newview/skins/firestorm/colors.xml
+++ b/indra/newview/skins/firestorm/colors.xml
@@ -528,6 +528,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/firestorm/themes/blue/colors.xml b/indra/newview/skins/firestorm/themes/blue/colors.xml
index fdcf048e9c..c90540f55e 100644
--- a/indra/newview/skins/firestorm/themes/blue/colors.xml
+++ b/indra/newview/skins/firestorm/themes/blue/colors.xml
@@ -255,6 +255,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LSteel" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/firestorm/themes/highcontrast/colors.xml b/indra/newview/skins/firestorm/themes/highcontrast/colors.xml
index 997662a965..80bcab3777 100644
--- a/indra/newview/skins/firestorm/themes/highcontrast/colors.xml
+++ b/indra/newview/skins/firestorm/themes/highcontrast/colors.xml
@@ -541,6 +541,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/metaharper/colors.xml b/indra/newview/skins/metaharper/colors.xml
index 3f13005aec..341721c9eb 100644
--- a/indra/newview/skins/metaharper/colors.xml
+++ b/indra/newview/skins/metaharper/colors.xml
@@ -523,6 +523,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml b/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
index 12addf0cb8..182ff1599e 100644
--- a/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
+++ b/indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
@@ -518,6 +518,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/metaharper/themes/cool_ocean/colors.xml b/indra/newview/skins/metaharper/themes/cool_ocean/colors.xml
index bf67257744..80c2d0957c 100644
--- a/indra/newview/skins/metaharper/themes/cool_ocean/colors.xml
+++ b/indra/newview/skins/metaharper/themes/cool_ocean/colors.xml
@@ -536,6 +536,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="SchemeLightest_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/colors.xml b/indra/newview/skins/starlight/colors.xml
index 54cb775011..cf753f9481 100644
--- a/indra/newview/skins/starlight/colors.xml
+++ b/indra/newview/skins/starlight/colors.xml
@@ -598,6 +598,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/mono_teal/colors.xml b/indra/newview/skins/starlight/themes/mono_teal/colors.xml
index 1a3827b190..ad4a3cc383 100644
--- a/indra/newview/skins/starlight/themes/mono_teal/colors.xml
+++ b/indra/newview/skins/starlight/themes/mono_teal/colors.xml
@@ -599,6 +599,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
index cf97e7e2ec..de3a04c8f5 100644
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
@@ -598,6 +598,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/original_orange/colors.xml b/indra/newview/skins/starlight/themes/original_orange/colors.xml
index fb8c4f0339..a0a64bb4b6 100644
--- a/indra/newview/skins/starlight/themes/original_orange/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_orange/colors.xml
@@ -598,6 +598,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/original_teal/colors.xml b/indra/newview/skins/starlight/themes/original_teal/colors.xml
index 32531bfa29..4c1663c12e 100644
--- a/indra/newview/skins/starlight/themes/original_teal/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_teal/colors.xml
@@ -598,6 +598,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/silver_blue/colors.xml b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
index 27f6abf320..a7f9d82e3d 100644
--- a/indra/newview/skins/starlight/themes/silver_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
@@ -600,6 +600,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlight/themes/silver_pink/colors.xml b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
index 8c794f7038..c68f40c527 100644
--- a/indra/newview/skins/starlight/themes/silver_pink/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
@@ -600,6 +600,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlightcui/colors.xml b/indra/newview/skins/starlightcui/colors.xml
index 54cb775011..cf753f9481 100644
--- a/indra/newview/skins/starlightcui/colors.xml
+++ b/indra/newview/skins/starlightcui/colors.xml
@@ -598,6 +598,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml b/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
index f797015122..3e58d29492 100644
--- a/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
+++ b/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
@@ -618,6 +618,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="White_25" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="EmphasisColor" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
diff --git a/indra/newview/skins/starlightcui/themes/custom_light/colors.xml b/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
index c5c3cf0646..479314b6a1 100644
--- a/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
+++ b/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
@@ -620,6 +620,15 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="White_25" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="EmphasisColor" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />