Move options into filter bar, align items
Color type icons with selection color
Remove preview button