case 2586 - Search colors are changed.
Merge branch 'case-2586' into develop