Remove background images and use borders instead