Rename images to be more clear
Update image names
Set correct border for different grid screens