Filter fixed,
Icons added,
ComboBox fixed