LOW : fixing issue with icon comparison
LOW : Fixed issue with Icons handling
LOW : Issue with Icons Fixing