Added more fixes to labels and icons