Applyed fixes to labels and added icons