Icon fix + Grid menu fix