diff --git a/src/modal-checkout/checkout.scss b/src/modal-checkout/checkout.scss
index 06a443062..a1a856fba 100644
--- a/src/modal-checkout/checkout.scss
+++ b/src/modal-checkout/checkout.scss
@@ -369,7 +369,7 @@
 			}
 
 			ul.wc-saved-payment-methods {
-				margin-top: var(--newspack-ui-spacer-3, 16px);
+				margin: var(--newspack-ui-spacer-3, 16px) 0 0;
 				padding: 0;
 
 				li {
@@ -383,6 +383,7 @@
 						font-size: var(--newspack-ui-font-size-xs, 14px);
 						font-weight: normal;
 						line-height: inherit;
+						margin: 0;
 					}
 
 					input {
@@ -392,17 +393,13 @@
 			}
 
 			fieldset {
-				margin: 0 0 var(--newspack-ui-spacer-2, 12px);
+				margin: var(--newspack-ui-spacer-3, 16px) 0 0;
 				padding: 0 !important; // To override inline styles.
 
 				&.wc-payment-form {
 					margin-top: var(--newspack-ui-spacer-3, 16px);
 				}
 
-				&:last-child {
-					margin-bottom: 0;
-				}
-
 				p {
 					font-size: var(--newspack-ui-font-size-xs, 14px);
 					line-height: var(--newspack-ui-line-height-xs, 1.4286);
@@ -540,11 +537,20 @@
 		margin: var(--newspack-ui-spacer-3, 16px) 0 0;
 	}
 
+	// Hide 'Save New' checkbox container if the credit card form is hidden -- this means the checkbox is also hidden and gets rid of extra space.
+	fieldset:has(.woocommerce-SavedPaymentMethods-saveNew[style*="display: none"]) {
+		display: none;
+	}
+
 	// WooPayments inputs
 	#wcpay-upe-element,
 	.wcpay-upe-element {
-		margin: 0 0 var(--newspack-ui-spacer-3, 16px);
+		margin: 0;
 		padding: 0;
+
+		+ div:has(.woocommerce-SavedPaymentMethods-saveNew) {
+			margin-top: var(--newspack-ui-spacer-3, 16px);
+		}
 	}
 
 	.payment_method_woocommerce_payments {