Merge "RCFilters UI: Add highlight icon"