Fix removing icon from a key filter
(cherry picked from commit 32dea3b556d6f0af8281d81b54ce299a6fa5a7d0)