I have attached the patch for Claro & Stable theme. Please review.