Change-Id: Ia955180781142295991df179fa419690fd0ffeee
Change-Id: I1d3309d4e5f9ebb95c2907440ffae69bf8167ce3
Fix text overlapping icon issue. Add new icons for filter options