Fix for the button in the 'filter' modal; added new icons.
Merge remote-tracking branch 'origin/master'