Add icons to filters again, add dividers