Fixed type and icons after scan suggestion