Changed close button icon and renamed icon variables