diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index d07a0dc159..c66be7d147 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -901,7 +901,10 @@ void LLButton::draw()
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        label_color = ll::ui::SearchableControl::getHighlightFontColor();
+        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
+        //label_color = ll::ui::SearchableControl::getHighlightFontColor();
+        label_color = ll::ui::SearchableControl::getHighlightBgColor();
+        // </FS>
 
     // overlay with keyboard focus border
     if (hasFocus())
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 42451bd83f..39abd39bb8 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -529,7 +529,10 @@ void LLMenuItemGL::draw( void )
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        color = ll::ui::SearchableControl::getHighlightFontColor();
+        // <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
+        //color = ll::ui::SearchableControl::getHighlightFontColor();
+        color = ll::ui::SearchableControl::getHighlightBgColor();
+        // </FS>
 
     // Draw the text on top.
     if (mBriefItem)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index b0545f31a9..63e1ee2e35 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1839,10 +1839,10 @@
      width="44">
         <color_swatch.init_callback
         function="Pref.getUIColor"
-        parameter="SearchableControlHighlightColor" />
+        parameter="SearchableControlHighlightBgColor" />
         <color_swatch.commit_callback
         function="Pref.applyUIColor"
-        parameter="SearchableControlHighlightColor" />
+        parameter="SearchableControlHighlightBgColor" />
      </color_swatch>
 
      <text