diff --git a/client/components/tooltip/style.scss b/client/components/tooltip/style.scss
index 27122be036e..a7b66916aae 100644
--- a/client/components/tooltip/style.scss
+++ b/client/components/tooltip/style.scss
@@ -17,6 +17,7 @@
 			transition: all 0.3s ease;
 			fill: currentColor;
 			margin: 0 0.4em;
+			vertical-align: text-bottom;
 
 			&:focus,
 			&:hover,
diff --git a/client/payment-details/dispute-details/style.scss b/client/payment-details/dispute-details/style.scss
index 89bc42824b1..e51559f4fcd 100644
--- a/client/payment-details/dispute-details/style.scss
+++ b/client/payment-details/dispute-details/style.scss
@@ -81,12 +81,8 @@
 			border-bottom: 1px solid $wp-gray-5;
 		}
 
-		.wcpay-tooltip__content-wrapper.wcpay-tooltip--click__content-wrapper
-			> .wcpay-tooltip__content-wrapper
-			> [role='button'] {
-			margin-left: 0;
-			margin-right: 0;
-			vertical-align: text-bottom;
+		.wcpay-tooltip__content-wrapper > [role='button'] {
+			margin: 0;
 		}
 
 		&__response-date {