Change icons and add css styles for grouping