"I am delighted to be back at Moss Rose, and looking forward to the new campaign," said Navarro, who joined from Accrington last October.

Boss Brian Horton added on the club website: "He made a big impression last season, and has the qualities I need to drive for sucess in League Two."

Horton has already captured striker Matty McNeil, who recently made his loan move from Hyde United permanent.