Have you tried I&S Glass - on the same street as Pedro's, opposite side before you get to Pinocchio.