Replace toggle closed icon and include sort dropdown content on all sort templates