diff --git a/assets/js/components/Notice/index.js b/assets/js/components/Notice/index.js
index d69bcb1cca3..edfaa2c6e4e 100644
--- a/assets/js/components/Notice/index.js
+++ b/assets/js/components/Notice/index.js
@@ -50,59 +50,60 @@ const Notice = forwardRef(
 		ref
 	) => {
 		return (
-			<div
-				ref={ ref }
-				className={ classnames(
-					'googlesitekit-notice',
-					`googlesitekit-notice--${ type }`,
-					className
-				) }
-			>
-				{ ! hideIcon && (
-					<div className="googlesitekit-notice__icon">
-						<Icon type={ type } />
-					</div>
-				) }
-
-				<div className="googlesitekit-notice__content">
-					{ title && <Title>{ title }</Title> }
-					{ description && (
-						<Description>{ description }</Description>
+			<div className="googlesitekit-notice-container" ref={ ref }>
+				<div
+					className={ classnames(
+						'googlesitekit-notice',
+						`googlesitekit-notice--${ type }`,
+						className
+					) }
+				>
+					{ ! hideIcon && (
+						<div className="googlesitekit-notice__icon">
+							<Icon type={ type } />
+						</div>
 					) }
-				</div>
-
-				{ ( dismissButton?.label ||
-					dismissButton?.onClick ||
-					( ctaButton?.label &&
-						( ctaButton?.onClick || ctaButton?.href ) ) ||
-					children ) && (
-					<div className="googlesitekit-notice__action">
-						{ children }
 
-						{ ( dismissButton?.label ||
-							dismissButton?.onClick ) && (
-							<DismissButton
-								label={ dismissButton.label }
-								onClick={ dismissButton.onClick }
-								disabled={ dismissButton.disabled }
-							/>
+					<div className="googlesitekit-notice__content">
+						{ title && <Title>{ title }</Title> }
+						{ description && (
+							<Description>{ description }</Description>
 						) }
-						{ ctaButton?.label &&
-							( ctaButton?.onClick || ctaButton?.href ) && (
-								<CTAButton
-									label={ ctaButton.label }
-									onClick={ ctaButton.onClick }
-									inProgress={ ctaButton.inProgress }
-									disabled={ ctaButton.disabled }
-									href={ ctaButton.href }
-									external={ ctaButton.external }
-									hideExternalIndicator={
-										ctaButton.hideExternalIndicator
-									}
+					</div>
+
+					{ ( dismissButton?.label ||
+						dismissButton?.onClick ||
+						( ctaButton?.label &&
+							( ctaButton?.onClick || ctaButton?.href ) ) ||
+						children ) && (
+						<div className="googlesitekit-notice__action">
+							{ children }
+
+							{ ( dismissButton?.label ||
+								dismissButton?.onClick ) && (
+								<DismissButton
+									label={ dismissButton.label }
+									onClick={ dismissButton.onClick }
+									disabled={ dismissButton.disabled }
 								/>
 							) }
-					</div>
-				) }
+							{ ctaButton?.label &&
+								( ctaButton?.onClick || ctaButton?.href ) && (
+									<CTAButton
+										label={ ctaButton.label }
+										onClick={ ctaButton.onClick }
+										inProgress={ ctaButton.inProgress }
+										disabled={ ctaButton.disabled }
+										href={ ctaButton.href }
+										external={ ctaButton.external }
+										hideExternalIndicator={
+											ctaButton.hideExternalIndicator
+										}
+									/>
+								) }
+						</div>
+					) }
+				</div>
 			</div>
 		);
 	}
diff --git a/assets/js/components/google-tag-gateway/__snapshots__/GoogleTagGatewayToggle.test.js.snap b/assets/js/components/google-tag-gateway/__snapshots__/GoogleTagGatewayToggle.test.js.snap
index 358453ee04e..1cb2fdc94d3 100644
--- a/assets/js/components/google-tag-gateway/__snapshots__/GoogleTagGatewayToggle.test.js.snap
+++ b/assets/js/components/google-tag-gateway/__snapshots__/GoogleTagGatewayToggle.test.js.snap
@@ -156,40 +156,44 @@ exports[`GoogleTagGatewayToggle should render in disabled state if server requir
       </a>
     </p>
     <div
-      class="googlesitekit-notice googlesitekit-notice--warning"
+      class="googlesitekit-notice-container"
     >
       <div
-        class="googlesitekit-notice__icon"
+        class="googlesitekit-notice googlesitekit-notice--warning"
       >
-        <svg />
-      </div>
-      <div
-        class="googlesitekit-notice__content"
-      >
-        <p
-          class="googlesitekit-notice__title"
+        <div
+          class="googlesitekit-notice__icon"
+        >
+          <svg />
+        </div>
+        <div
+          class="googlesitekit-notice__content"
         >
-          Your server’s current settings prevent Google tag gateway for advertisers from working. To enable it, please contact your hosting provider and request access to external resources and plugin files. 
-          <a
-            aria-label="Learn more about Google tag gateway for advertisers server requirements (opens in a new tab)"
-            class="googlesitekit-cta-link"
-            href="undefined?doc=google-tag-gateway-server-requirements"
-            rel="noopener noreferrer"
-            target="_blank"
+          <p
+            class="googlesitekit-notice__title"
           >
-            <span
-              class="googlesitekit-cta-link__contents"
+            Your server’s current settings prevent Google tag gateway for advertisers from working. To enable it, please contact your hosting provider and request access to external resources and plugin files. 
+            <a
+              aria-label="Learn more about Google tag gateway for advertisers server requirements (opens in a new tab)"
+              class="googlesitekit-cta-link"
+              href="undefined?doc=google-tag-gateway-server-requirements"
+              rel="noopener noreferrer"
+              target="_blank"
             >
-              Learn more
-            </span>
-            <span
-              class="googlesitekit-icon-wrapper"
-              style="margin-left: 5px;"
-            >
-              <svg />
-            </span>
-          </a>
-        </p>
+              <span
+                class="googlesitekit-cta-link__contents"
+              >
+                Learn more
+              </span>
+              <span
+                class="googlesitekit-icon-wrapper"
+                style="margin-left: 5px;"
+              >
+                <svg />
+              </span>
+            </a>
+          </p>
+        </div>
       </div>
     </div>
   </div>
diff --git a/assets/js/components/key-metrics-setup/__snapshots__/KeyMetricsSetupApp.test.js.snap b/assets/js/components/key-metrics-setup/__snapshots__/KeyMetricsSetupApp.test.js.snap
index 5292bf1670e..7c61660b639 100644
--- a/assets/js/components/key-metrics-setup/__snapshots__/KeyMetricsSetupApp.test.js.snap
+++ b/assets/js/components/key-metrics-setup/__snapshots__/KeyMetricsSetupApp.test.js.snap
@@ -509,21 +509,25 @@ exports[`KeyMetricsSetupApp initial setup flow should display the progress indic
     </div>
   </div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
+      class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
     >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
-    >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
+      >
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
       >
-        Google Analytics was successfully set up
-      </p>
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Google Analytics was successfully set up
+        </p>
+      </div>
     </div>
   </div>
 </div>
@@ -1004,21 +1008,25 @@ exports[`KeyMetricsSetupApp should render correctly 1`] = `
     </div>
   </div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
-    >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
+      class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
     >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
+      >
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
       >
-        Google Analytics was successfully set up
-      </p>
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Google Analytics was successfully set up
+        </p>
+      </div>
     </div>
   </div>
 </div>
@@ -1480,23 +1488,27 @@ exports[`KeyMetricsSetupApp should show an error when the save fails 1`] = `
                   class="googlesitekit-user-input__error"
                 >
                   <div
-                    class="googlesitekit-notice googlesitekit-notice--error"
+                    class="googlesitekit-notice-container"
                   >
                     <div
-                      class="googlesitekit-notice__icon"
+                      class="googlesitekit-notice googlesitekit-notice--error"
                     >
-                      <svg />
-                    </div>
-                    <div
-                      class="googlesitekit-notice__content"
-                    >
-                      <p
-                        class="googlesitekit-notice__description"
+                      <div
+                        class="googlesitekit-notice__icon"
                       >
-                        <span>
-                          Error: Internal server error (Please try again.)
-                        </span>
-                      </p>
+                        <svg />
+                      </div>
+                      <div
+                        class="googlesitekit-notice__content"
+                      >
+                        <p
+                          class="googlesitekit-notice__description"
+                        >
+                          <span>
+                            Error: Internal server error (Please try again.)
+                          </span>
+                        </p>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1522,21 +1534,25 @@ exports[`KeyMetricsSetupApp should show an error when the save fails 1`] = `
     </div>
   </div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
+      class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
     >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
-    >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
+      >
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
       >
-        Google Analytics was successfully set up
-      </p>
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Google Analytics was successfully set up
+        </p>
+      </div>
     </div>
   </div>
 </div>
@@ -2017,21 +2033,25 @@ exports[`KeyMetricsSetupApp should show the analytics setup success toast notice
     </div>
   </div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
-    >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
+      class="googlesitekit-notice googlesitekit-notice--success googlesitekit-toast-notice"
     >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
       >
-        Google Analytics was successfully set up
-      </p>
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
+      >
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Google Analytics was successfully set up
+        </p>
+      </div>
     </div>
   </div>
 </div>
diff --git a/assets/js/components/notifications/__snapshots__/GoogleTagGatewaySetupSuccessSubtleNotification.test.js.snap b/assets/js/components/notifications/__snapshots__/GoogleTagGatewaySetupSuccessSubtleNotification.test.js.snap
index 4f3924ce4c7..d82a3614c44 100644
--- a/assets/js/components/notifications/__snapshots__/GoogleTagGatewaySetupSuccessSubtleNotification.test.js.snap
+++ b/assets/js/components/notifications/__snapshots__/GoogleTagGatewaySetupSuccessSubtleNotification.test.js.snap
@@ -15,40 +15,44 @@ exports[`GoogleTagGatewaySetupSuccessSubtleNotification should render correctly
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--success"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--success"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__title"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                You successfully enabled Google tag gateway for advertisers!
-              </p>
-              <p
-                class="googlesitekit-notice__description"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                You can always disable it in Analytics or Ads settings
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
+                <p
+                  class="googlesitekit-notice__title"
+                >
+                  You successfully enabled Google tag gateway for advertisers!
+                </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  You can always disable it in Analytics or Ads settings
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
               >
-                <span
-                  class="mdc-button__label"
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
                 >
-                  Got it
-                </span>
-              </button>
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Got it
+                  </span>
+                </button>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap b/assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap
index 528b0fbe53d..a4394ff2aa6 100644
--- a/assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap
+++ b/assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap
@@ -19,23 +19,27 @@ exports[`WPDashboardReportError should only render one error per module when the
           class="googlesitekit-cta__description"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--error"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--error"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__description"
+              <div
+                class="googlesitekit-notice__icon"
+              >
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                <span>
-                  Error: Test error message (Please try again.)
-                </span>
-              </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  <span>
+                    Error: Test error message (Please try again.)
+                  </span>
+                </p>
+              </div>
             </div>
           </div>
         </div>
@@ -78,23 +82,27 @@ exports[`WPDashboardReportError should only render one error per module when the
           class="googlesitekit-cta__description"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--error"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--error"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__description"
+              <div
+                class="googlesitekit-notice__icon"
+              >
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                <span>
-                  Error: Test error message (Please try again.)
-                </span>
-              </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  <span>
+                    Error: Test error message (Please try again.)
+                  </span>
+                </p>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/ads/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap b/assets/js/modules/ads/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
index 6f28b46ab40..fdc91bc83b4 100644
--- a/assets/js/modules/ads/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
+++ b/assets/js/modules/ads/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
@@ -15,72 +15,76 @@ exports[`Ads EnhancedConversionsNotification should render the notification 1`]
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--info-alt"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--info-alt"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__title"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                Boost your data and Ads results with enhanced conversions
-              </p>
-              <p
-                class="googlesitekit-notice__description"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                Site Kit now supports enhanced conversions. This feature helps your ads count sales and leads more accurately, even across different devices, so your budget is spent smarter. To turn this on, simply agree to the terms of service in your Ads account and enable enhanced conversions. 
-                <a
-                  aria-label="Learn more (opens in a new tab)"
-                  class="googlesitekit-cta-link"
-                  href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-ads"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <p
+                  class="googlesitekit-notice__title"
+                >
+                  Boost your data and Ads results with enhanced conversions
+                </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  Site Kit now supports enhanced conversions. This feature helps your ads count sales and leads more accurately, even across different devices, so your budget is spent smarter. To turn this on, simply agree to the terms of service in your Ads account and enable enhanced conversions. 
+                  <a
+                    aria-label="Learn more (opens in a new tab)"
+                    class="googlesitekit-cta-link"
+                    href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-ads"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    <span
+                      class="googlesitekit-cta-link__contents"
+                    >
+                      Learn more
+                    </span>
+                    <span
+                      class="googlesitekit-icon-wrapper"
+                      style="margin-left: 5px;"
+                    >
+                      <svg />
+                    </span>
+                  </a>
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
+              >
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
                 >
                   <span
-                    class="googlesitekit-cta-link__contents"
+                    class="mdc-button__label"
                   >
-                    Learn more
+                    No thanks
                   </span>
+                </button>
+                <a
+                  aria-label="Go to Ads (opens in a new tab)"
+                  class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+                  href="https://ads.google.com/aw/conversions/customersettings"
+                  role="button"
+                  target="_blank"
+                >
                   <span
-                    class="googlesitekit-icon-wrapper"
-                    style="margin-left: 5px;"
+                    class="mdc-button__label"
                   >
-                    <svg />
+                    Go to Ads
                   </span>
                 </a>
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
-              >
-                <span
-                  class="mdc-button__label"
-                >
-                  No thanks
-                </span>
-              </button>
-              <a
-                aria-label="Go to Ads (opens in a new tab)"
-                class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-                href="https://ads.google.com/aw/conversions/customersettings"
-                role="button"
-                target="_blank"
-              >
-                <span
-                  class="mdc-button__label"
-                >
-                  Go to Ads
-                </span>
-              </a>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/ads/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap b/assets/js/modules/ads/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
index 30e44ffdcef..725573ca24f 100644
--- a/assets/js/modules/ads/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
+++ b/assets/js/modules/ads/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
@@ -3,72 +3,76 @@
 exports[`Ads EnhancedConversionsNotification should render the notice 1`] = `
 <div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--info"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
+      class="googlesitekit-notice googlesitekit-notice--info"
     >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
-    >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
       >
-        Boost your data and Ads results with enhanced conversions
-      </p>
-      <p
-        class="googlesitekit-notice__description"
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
       >
-        Site Kit now supports enhanced conversions. This feature helps your ads count sales and leads more accurately, even across different devices, so your budget is spent smarter. To turn this on, simply agree to the terms of service in your Ads account and enable enhanced conversions. 
-        <a
-          aria-label="Learn more (opens in a new tab)"
-          class="googlesitekit-cta-link"
-          href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-ads"
-          rel="noopener noreferrer"
-          target="_blank"
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Boost your data and Ads results with enhanced conversions
+        </p>
+        <p
+          class="googlesitekit-notice__description"
+        >
+          Site Kit now supports enhanced conversions. This feature helps your ads count sales and leads more accurately, even across different devices, so your budget is spent smarter. To turn this on, simply agree to the terms of service in your Ads account and enable enhanced conversions. 
+          <a
+            aria-label="Learn more (opens in a new tab)"
+            class="googlesitekit-cta-link"
+            href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-ads"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <span
+              class="googlesitekit-cta-link__contents"
+            >
+              Learn more
+            </span>
+            <span
+              class="googlesitekit-icon-wrapper"
+              style="margin-left: 5px;"
+            >
+              <svg />
+            </span>
+          </a>
+        </p>
+      </div>
+      <div
+        class="googlesitekit-notice__action"
+      >
+        <button
+          class="mdc-button mdc-button--tertiary"
+          target="_self"
         >
           <span
-            class="googlesitekit-cta-link__contents"
+            class="mdc-button__label"
           >
-            Learn more
+            No thanks
           </span>
+        </button>
+        <a
+          aria-label="Go to Ads (opens in a new tab)"
+          class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+          href="https://ads.google.com/aw/conversions/customersettings"
+          role="button"
+          target="_blank"
+        >
           <span
-            class="googlesitekit-icon-wrapper"
-            style="margin-left: 5px;"
+            class="mdc-button__label"
           >
-            <svg />
+            Go to Ads
           </span>
         </a>
-      </p>
-    </div>
-    <div
-      class="googlesitekit-notice__action"
-    >
-      <button
-        class="mdc-button mdc-button--tertiary"
-        target="_self"
-      >
-        <span
-          class="mdc-button__label"
-        >
-          No thanks
-        </span>
-      </button>
-      <a
-        aria-label="Go to Ads (opens in a new tab)"
-        class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-        href="https://ads.google.com/aw/conversions/customersettings"
-        role="button"
-        target="_blank"
-      >
-        <span
-          class="mdc-button__label"
-        >
-          Go to Ads
-        </span>
-      </a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/assets/js/modules/adsense/components/dashboard/__snapshots__/AdBlockingRecoverySetupSuccessNotification.test.js.snap b/assets/js/modules/adsense/components/dashboard/__snapshots__/AdBlockingRecoverySetupSuccessNotification.test.js.snap
index 7e35029dddc..c5fbd18a68a 100644
--- a/assets/js/modules/adsense/components/dashboard/__snapshots__/AdBlockingRecoverySetupSuccessNotification.test.js.snap
+++ b/assets/js/modules/adsense/components/dashboard/__snapshots__/AdBlockingRecoverySetupSuccessNotification.test.js.snap
@@ -15,54 +15,58 @@ exports[`AdBlockingRecoverySetupSuccessNotification should render notification a
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--success"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--success"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__title"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                You successfully enabled the ad blocking recovery message
-              </p>
-              <p
-                class="googlesitekit-notice__description"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                Make sure to also create the message in 
-                <a
-                  aria-label="AdSense (opens in a new tab)"
-                  class="googlesitekit-cta-link"
-                  href=""
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <p
+                  class="googlesitekit-notice__title"
                 >
-                  <span
-                    class="googlesitekit-cta-link__contents"
+                  You successfully enabled the ad blocking recovery message
+                </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  Make sure to also create the message in 
+                  <a
+                    aria-label="AdSense (opens in a new tab)"
+                    class="googlesitekit-cta-link"
+                    href=""
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
-                    AdSense
-                  </span>
-                </a>
-                , otherwise this feature won’t work
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
+                    <span
+                      class="googlesitekit-cta-link__contents"
+                    >
+                      AdSense
+                    </span>
+                  </a>
+                  , otherwise this feature won’t work
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
               >
-                <span
-                  class="mdc-button__label"
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
                 >
-                  Got it
-                </span>
-              </button>
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Got it
+                  </span>
+                </button>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/__snapshots__/AudienceCreationNotice.test.js.snap b/assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/__snapshots__/AudienceCreationNotice.test.js.snap
index 22de3bb589c..a75a8193a75 100644
--- a/assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/__snapshots__/AudienceCreationNotice.test.js.snap
+++ b/assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/__snapshots__/AudienceCreationNotice.test.js.snap
@@ -195,30 +195,34 @@ exports[`AudienceCreationNotice should render the missing scope notice if the us
       </div>
     </div>
     <div
-      class="googlesitekit-notice googlesitekit-notice--warning"
+      class="googlesitekit-notice-container"
     >
       <div
-        class="googlesitekit-notice__content"
+        class="googlesitekit-notice googlesitekit-notice--warning"
       >
-        <p
-          class="googlesitekit-notice__description"
+        <div
+          class="googlesitekit-notice__content"
         >
-          Creating these groups require more data tracking. You will be directed to update your Analytics property.
-        </p>
-      </div>
-      <div
-        class="googlesitekit-notice__action"
-      >
-        <button
-          class="mdc-button mdc-button--tertiary"
-          target="_self"
+          <p
+            class="googlesitekit-notice__description"
+          >
+            Creating these groups require more data tracking. You will be directed to update your Analytics property.
+          </p>
+        </div>
+        <div
+          class="googlesitekit-notice__action"
         >
-          <span
-            class="mdc-button__label"
+          <button
+            class="mdc-button mdc-button--tertiary"
+            target="_self"
           >
-            Got it
-          </span>
-        </button>
+            <span
+              class="mdc-button__label"
+            >
+              Got it
+            </span>
+          </button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap b/assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap
index 867a0df44bc..431033f0940 100644
--- a/assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap
+++ b/assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap
@@ -238,59 +238,63 @@ exports[`EnhancedMeasurementActivationBanner should render the success step when
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--success"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--success"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__title"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                You successfully enabled enhanced measurement for your site
-              </p>
-              <p
-                class="googlesitekit-notice__description"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                Your configured Analytics web data stream will now automatically measure interactions on your site in addition to standard page views measurement. 
-                <a
-                  aria-label="Learn more (opens in a new tab)"
-                  class="googlesitekit-cta-link"
-                  href="https://support.google.com/analytics/answer/9216061?hl=en-US"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <p
+                  class="googlesitekit-notice__title"
                 >
-                  <span
-                    class="googlesitekit-cta-link__contents"
+                  You successfully enabled enhanced measurement for your site
+                </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  Your configured Analytics web data stream will now automatically measure interactions on your site in addition to standard page views measurement. 
+                  <a
+                    aria-label="Learn more (opens in a new tab)"
+                    class="googlesitekit-cta-link"
+                    href="https://support.google.com/analytics/answer/9216061?hl=en-US"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
-                    Learn more
-                  </span>
+                    <span
+                      class="googlesitekit-cta-link__contents"
+                    >
+                      Learn more
+                    </span>
+                    <span
+                      class="googlesitekit-icon-wrapper"
+                      style="margin-left: 5px;"
+                    >
+                      <svg />
+                    </span>
+                  </a>
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
+              >
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
+                >
                   <span
-                    class="googlesitekit-icon-wrapper"
-                    style="margin-left: 5px;"
+                    class="mdc-button__label"
                   >
-                    <svg />
+                    Got it
                   </span>
-                </a>
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
-              >
-                <span
-                  class="mdc-button__label"
-                >
-                  Got it
-                </span>
-              </button>
+                </button>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/analytics-4/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap b/assets/js/modules/analytics-4/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
index 12df8c21595..8e5c0ed3bfa 100644
--- a/assets/js/modules/analytics-4/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
+++ b/assets/js/modules/analytics-4/components/notifications/__snapshots__/EnhancedConversionsNotification.test.js.snap
@@ -15,72 +15,76 @@ exports[`Analytics EnhancedConversionsNotification should render the notificatio
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--info-alt"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--info-alt"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__title"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                Boost your Analytics data with more metrics about your visitors
-              </p>
-              <p
-                class="googlesitekit-notice__description"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                Site Kit now supports user-provided data collection, a free feature which helps you get a more complete and reliable count of your sales and leads from your website, even when people switch devices. To activate, turn on the setting for collecting user data in your Analytics account. 
-                <a
-                  aria-label="Learn more (opens in a new tab)"
-                  class="googlesitekit-cta-link"
-                  href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-analytics"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <p
+                  class="googlesitekit-notice__title"
+                >
+                  Boost your Analytics data with more metrics about your visitors
+                </p>
+                <p
+                  class="googlesitekit-notice__description"
+                >
+                  Site Kit now supports user-provided data collection, a free feature which helps you get a more complete and reliable count of your sales and leads from your website, even when people switch devices. To activate, turn on the setting for collecting user data in your Analytics account. 
+                  <a
+                    aria-label="Learn more (opens in a new tab)"
+                    class="googlesitekit-cta-link"
+                    href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-analytics"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    <span
+                      class="googlesitekit-cta-link__contents"
+                    >
+                      Learn more
+                    </span>
+                    <span
+                      class="googlesitekit-icon-wrapper"
+                      style="margin-left: 5px;"
+                    >
+                      <svg />
+                    </span>
+                  </a>
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
+              >
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
                 >
                   <span
-                    class="googlesitekit-cta-link__contents"
+                    class="mdc-button__label"
                   >
-                    Learn more
+                    No thanks
                   </span>
+                </button>
+                <a
+                  aria-label="Go to Analytics (opens in a new tab)"
+                  class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+                  href="https://accounts.google.com/accountchooser?continue=https%3A%2F%2Fanalytics.google.com%2Fanalytics%2Fweb%2F%23%2Fa123456p654321%2Fadmin%2Fdatapolicies%2Fdatacollection%3Futm_source%3Dsitekit&Email=wapuu.wordpress%40gmail.com&utm_source=sitekit"
+                  role="button"
+                  target="_blank"
+                >
                   <span
-                    class="googlesitekit-icon-wrapper"
-                    style="margin-left: 5px;"
+                    class="mdc-button__label"
                   >
-                    <svg />
+                    Go to Analytics
                   </span>
                 </a>
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
-              >
-                <span
-                  class="mdc-button__label"
-                >
-                  No thanks
-                </span>
-              </button>
-              <a
-                aria-label="Go to Analytics (opens in a new tab)"
-                class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-                href="https://accounts.google.com/accountchooser?continue=https%3A%2F%2Fanalytics.google.com%2Fanalytics%2Fweb%2F%23%2Fa123456p654321%2Fadmin%2Fdatapolicies%2Fdatacollection%3Futm_source%3Dsitekit&Email=wapuu.wordpress%40gmail.com&utm_source=sitekit"
-                role="button"
-                target="_blank"
-              >
-                <span
-                  class="mdc-button__label"
-                >
-                  Go to Analytics
-                </span>
-              </a>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/analytics-4/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap b/assets/js/modules/analytics-4/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
index 91c86cffc79..bc7397ebd31 100644
--- a/assets/js/modules/analytics-4/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
+++ b/assets/js/modules/analytics-4/components/settings/__snapshots__/EnhancedConversionsSettingsNotice.test.js.snap
@@ -3,72 +3,76 @@
 exports[`Analytics EnhancedConversionsNotification should render the notice 1`] = `
 <div>
   <div
-    class="googlesitekit-notice googlesitekit-notice--info"
+    class="googlesitekit-notice-container"
   >
     <div
-      class="googlesitekit-notice__icon"
+      class="googlesitekit-notice googlesitekit-notice--info"
     >
-      <svg />
-    </div>
-    <div
-      class="googlesitekit-notice__content"
-    >
-      <p
-        class="googlesitekit-notice__title"
+      <div
+        class="googlesitekit-notice__icon"
       >
-        Boost your Analytics data with more metrics about your visitors
-      </p>
-      <p
-        class="googlesitekit-notice__description"
+        <svg />
+      </div>
+      <div
+        class="googlesitekit-notice__content"
       >
-        Site Kit now supports user-provided data collection, a free feature which helps you get a more complete and reliable count of your sales and leads from your website, even when people switch devices. To activate, turn on the setting for collecting user data in your Analytics account. 
-        <a
-          aria-label="Learn more (opens in a new tab)"
-          class="googlesitekit-cta-link"
-          href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-analytics"
-          rel="noopener noreferrer"
-          target="_blank"
+        <p
+          class="googlesitekit-notice__title"
+        >
+          Boost your Analytics data with more metrics about your visitors
+        </p>
+        <p
+          class="googlesitekit-notice__description"
+        >
+          Site Kit now supports user-provided data collection, a free feature which helps you get a more complete and reliable count of your sales and leads from your website, even when people switch devices. To activate, turn on the setting for collecting user data in your Analytics account. 
+          <a
+            aria-label="Learn more (opens in a new tab)"
+            class="googlesitekit-cta-link"
+            href="https://sitekit.withgoogle.com/support/?doc=enhanced-conversions-analytics"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <span
+              class="googlesitekit-cta-link__contents"
+            >
+              Learn more
+            </span>
+            <span
+              class="googlesitekit-icon-wrapper"
+              style="margin-left: 5px;"
+            >
+              <svg />
+            </span>
+          </a>
+        </p>
+      </div>
+      <div
+        class="googlesitekit-notice__action"
+      >
+        <button
+          class="mdc-button mdc-button--tertiary"
+          target="_self"
         >
           <span
-            class="googlesitekit-cta-link__contents"
+            class="mdc-button__label"
           >
-            Learn more
+            No thanks
           </span>
+        </button>
+        <a
+          aria-label="Go to Analytics (opens in a new tab)"
+          class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+          href="https://accounts.google.com/accountchooser?continue=https%3A%2F%2Fanalytics.google.com%2Fanalytics%2Fweb%2F%23%2Fa123456p654321%2Fadmin%2Fdatapolicies%2Fdatacollection%3Futm_source%3Dsitekit&Email=wapuu.wordpress%40gmail.com&utm_source=sitekit"
+          role="button"
+          target="_blank"
+        >
           <span
-            class="googlesitekit-icon-wrapper"
-            style="margin-left: 5px;"
+            class="mdc-button__label"
           >
-            <svg />
+            Go to Analytics
           </span>
         </a>
-      </p>
-    </div>
-    <div
-      class="googlesitekit-notice__action"
-    >
-      <button
-        class="mdc-button mdc-button--tertiary"
-        target="_self"
-      >
-        <span
-          class="mdc-button__label"
-        >
-          No thanks
-        </span>
-      </button>
-      <a
-        aria-label="Go to Analytics (opens in a new tab)"
-        class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-        href="https://accounts.google.com/accountchooser?continue=https%3A%2F%2Fanalytics.google.com%2Fanalytics%2Fweb%2F%23%2Fa123456p654321%2Fadmin%2Fdatapolicies%2Fdatacollection%3Futm_source%3Dsitekit&Email=wapuu.wordpress%40gmail.com&utm_source=sitekit"
-        role="button"
-        target="_blank"
-      >
-        <span
-          class="mdc-button__label"
-        >
-          Go to Analytics
-        </span>
-      </a>
+      </div>
     </div>
   </div>
 </div>
diff --git a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js
index 0627eef9369..5e1bb12ee8c 100644
--- a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js
+++ b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js
@@ -131,7 +131,7 @@ describe( 'PublicationOnboardingStateNotice', () => {
 			).toHaveAttribute( 'href', expectedServiceURL );
 
 			expect( container.firstChild ).toHaveClass(
-				'googlesitekit-publication-onboarding-state-notice'
+				' googlesitekit-notice-container'
 			);
 
 			act( () => {
diff --git a/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDContributionsNotification.test.js.snap b/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDContributionsNotification.test.js.snap
index 54a013d4cc6..0c7cabca441 100644
--- a/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDContributionsNotification.test.js.snap
+++ b/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDContributionsNotification.test.js.snap
@@ -15,47 +15,51 @@ exports[`ProductIDContributionsNotification should render correctly 1`] = `
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--new"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--new"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__description"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                New! You can now select product IDs to use with your Reader Revenue Manager snippet
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                <span
-                  class="mdc-button__label"
+                <p
+                  class="googlesitekit-notice__description"
                 >
-                  Got it
-                </span>
-              </button>
-              <a
-                class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-                href="http://example.com/wp-admin/admin.php?page=googlesitekit-settings#connected-services/reader-revenue-manager/edit"
-                role="button"
-                target="_self"
+                  New! You can now select product IDs to use with your Reader Revenue Manager snippet
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
               >
-                <span
-                  class="mdc-button__label"
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
+                >
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Got it
+                  </span>
+                </button>
+                <a
+                  class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+                  href="http://example.com/wp-admin/admin.php?page=googlesitekit-settings#connected-services/reader-revenue-manager/edit"
+                  role="button"
+                  target="_self"
                 >
-                  Edit settings
-                </span>
-              </a>
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Edit settings
+                  </span>
+                </a>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDSubscriptionsNotification.test.js.snap b/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDSubscriptionsNotification.test.js.snap
index 2a86a6f342e..c16eb9ce208 100644
--- a/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDSubscriptionsNotification.test.js.snap
+++ b/assets/js/modules/reader-revenue-manager/components/dashboard/__snapshots__/ProductIDSubscriptionsNotification.test.js.snap
@@ -15,47 +15,51 @@ exports[`ProductIDSubscriptionsNotification should render correctly 1`] = `
           class="mdc-layout-grid__cell mdc-layout-grid__cell--align-middle mdc-layout-grid__cell--span-12"
         >
           <div
-            class="googlesitekit-notice googlesitekit-notice--warning"
+            class="googlesitekit-notice-container"
           >
             <div
-              class="googlesitekit-notice__icon"
+              class="googlesitekit-notice googlesitekit-notice--warning"
             >
-              <svg />
-            </div>
-            <div
-              class="googlesitekit-notice__content"
-            >
-              <p
-                class="googlesitekit-notice__description"
+              <div
+                class="googlesitekit-notice__icon"
               >
-                To complete your Reader Revenue Manager paywall setup, add your product IDs in settings
-              </p>
-            </div>
-            <div
-              class="googlesitekit-notice__action"
-            >
-              <button
-                class="mdc-button mdc-button--tertiary"
-                target="_self"
+                <svg />
+              </div>
+              <div
+                class="googlesitekit-notice__content"
               >
-                <span
-                  class="mdc-button__label"
+                <p
+                  class="googlesitekit-notice__description"
                 >
-                  Got it
-                </span>
-              </button>
-              <a
-                class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
-                href="http://example.com/wp-admin/admin.php?page=googlesitekit-settings#connected-services/reader-revenue-manager/edit"
-                role="button"
-                target="_self"
+                  To complete your Reader Revenue Manager paywall setup, add your product IDs in settings
+                </p>
+              </div>
+              <div
+                class="googlesitekit-notice__action"
               >
-                <span
-                  class="mdc-button__label"
+                <button
+                  class="mdc-button mdc-button--tertiary"
+                  target="_self"
+                >
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Got it
+                  </span>
+                </button>
+                <a
+                  class="mdc-button googlesitekit-notice__cta googlesitekit-button-icon--spinner googlesitekit-button-icon--spinner__after mdc-button--raised"
+                  href="http://example.com/wp-admin/admin.php?page=googlesitekit-settings#connected-services/reader-revenue-manager/edit"
+                  role="button"
+                  target="_self"
                 >
-                  Edit settings
-                </span>
-              </a>
+                  <span
+                    class="mdc-button__label"
+                  >
+                    Edit settings
+                  </span>
+                </a>
+              </div>
             </div>
           </div>
         </div>
diff --git a/assets/js/modules/reader-revenue-manager/components/settings/SettingsForm.js b/assets/js/modules/reader-revenue-manager/components/settings/SettingsForm.js
index 4437ce1c874..b576c1ad203 100644
--- a/assets/js/modules/reader-revenue-manager/components/settings/SettingsForm.js
+++ b/assets/js/modules/reader-revenue-manager/components/settings/SettingsForm.js
@@ -160,7 +160,7 @@ export default function SettingsForm( { hasModuleAccess } ) {
 				) }
 				{ ! hasModuleAccess && (
 					<Notice
-						className="googlesitekit-notice--bottom-margin"
+						className="googlesitekit-moduleaccess-warning-notice"
 						type={ Notice.TYPES.WARNING }
 						description={ createInterpolateElement(
 							sprintf(
diff --git a/assets/js/modules/reader-revenue-manager/components/setup/__snapshots__/SetupForm.test.js.snap b/assets/js/modules/reader-revenue-manager/components/setup/__snapshots__/SetupForm.test.js.snap
index 32e384ebdb3..0e2af8fc29e 100644
--- a/assets/js/modules/reader-revenue-manager/components/setup/__snapshots__/SetupForm.test.js.snap
+++ b/assets/js/modules/reader-revenue-manager/components/setup/__snapshots__/SetupForm.test.js.snap
@@ -4,23 +4,27 @@ exports[`SetupForm should not silently fail when there is an error 1`] = `
 <div>
   <form>
     <div
-      class="googlesitekit-notice googlesitekit-notice--error"
+      class="googlesitekit-notice-container"
     >
       <div
-        class="googlesitekit-notice__icon"
+        class="googlesitekit-notice googlesitekit-notice--error"
       >
-        <svg />
-      </div>
-      <div
-        class="googlesitekit-notice__content"
-      >
-        <p
-          class="googlesitekit-notice__description"
+        <div
+          class="googlesitekit-notice__icon"
         >
-          <span>
-            Error: Test error message (Please try again.)
-          </span>
-        </p>
+          <svg />
+        </div>
+        <div
+          class="googlesitekit-notice__content"
+        >
+          <p
+            class="googlesitekit-notice__description"
+          >
+            <span>
+              Error: Test error message (Please try again.)
+            </span>
+          </p>
+        </div>
       </div>
     </div>
     <p
diff --git a/assets/sass/components/analytics-4/audience-segmentation/_googlesitekit-audience-selection-panel.scss b/assets/sass/components/analytics-4/audience-segmentation/_googlesitekit-audience-selection-panel.scss
index 0878c6b0c87..31d4c3217a6 100644
--- a/assets/sass/components/analytics-4/audience-segmentation/_googlesitekit-audience-selection-panel.scss
+++ b/assets/sass/components/analytics-4/audience-segmentation/_googlesitekit-audience-selection-panel.scss
@@ -55,8 +55,16 @@
 					width: 150%;
 				}
 
-				p {
-					margin: 0;
+				@media (min-width: $bp-tablet) {
+					flex: 1;
+				}
+			}
+
+			.googlesitekit-notice__action {
+
+				@media (min-width: $bp-tablet) {
+					justify-content: normal;
+					width: auto;
 				}
 			}
 
diff --git a/assets/sass/components/notice/_googlesitekit-notice.scss b/assets/sass/components/notice/_googlesitekit-notice.scss
index ebac6477dd8..c512649b2e4 100644
--- a/assets/sass/components/notice/_googlesitekit-notice.scss
+++ b/assets/sass/components/notice/_googlesitekit-notice.scss
@@ -31,6 +31,11 @@
 	}
 }
 
+.googlesitekit-notice-container {
+	container-type: inline-size;
+	width: 100%; // Prevents shrinkage when the parent / wrapping container uses flexbox.
+}
+
 .googlesitekit-notice {
 	align-items: flex-start;
 	background-color: $c-content-primary-container;
@@ -41,7 +46,7 @@
 	gap: 10px;
 	padding: 14px $grid-gap-phone;
 
-	@media (min-width: $bp-tablet) {
+	@container (width > #{$container-width-desktop}) {
 		align-items: center;
 		flex-direction: row;
 		gap: $grid-gap-phone;
@@ -58,7 +63,7 @@
 		font-weight: $fw-normal;
 		line-height: $lh-title-sm;
 
-		@media (min-width: $bp-tablet) {
+		@container (width > #{$container-width-desktop}) {
 			flex: 1;
 		}
 
@@ -71,10 +76,8 @@
 		}
 
 		p {
-			margin: 0 0 10px;
-			@media (min-width: $bp-tablet) {
-				margin: 0;
-			}
+
+			margin: 0;
 
 			& > a,
 			& > span > a {
@@ -118,7 +121,7 @@
 			color: $c-content-on-primary-container;
 		}
 
-		@media (min-width: $bp-tablet) {
+		@container (width > #{$container-width-desktop}) {
 			margin: 0;
 		}
 
@@ -135,7 +138,7 @@
 		justify-content: end;
 		width: 100%;
 
-		@media (min-width: $bp-tablet) {
+		@container (width > #{$container-width-desktop}) {
 			justify-content: initial;
 			width: initial;
 		}
diff --git a/assets/sass/components/reader-revenue-manager/_googlesitekit-rrm-settings-module.scss b/assets/sass/components/reader-revenue-manager/_googlesitekit-rrm-settings-module.scss
index d3b005de500..efaf000ac5c 100644
--- a/assets/sass/components/reader-revenue-manager/_googlesitekit-rrm-settings-module.scss
+++ b/assets/sass/components/reader-revenue-manager/_googlesitekit-rrm-settings-module.scss
@@ -34,7 +34,7 @@
 			}
 		}
 
-		.googlesitekit-publication-onboarding-state-notice + .googlesitekit-settings-module__meta-items {
+		.googlesitekit-notice-container + .googlesitekit-settings-module__meta-items {
 			margin-top: $grid-gap-phone;
 
 			@media (min-width: $bp-desktop) {
@@ -56,6 +56,10 @@
 			}
 		}
 
+		.googlesitekit-notice-container .googlesitekit-moduleaccess-warning-notice {
+			margin-bottom: 8px; // Override 24px bottom margin to match spacing before the below `id-warning-notice` refactoring.
+		}
+
 		.googlesitekit-rrm-settings-edit__product-id-container {
 			align-items: center;
 			display: flex;
@@ -69,12 +73,35 @@
 				width: 100%;
 			}
 
+			.googlesitekit-rrm-settings-edit__product-id-warning-notice .googlesitekit-notice-container {
+				// This is a special case where we want the notice layout to depend on the viewport width
+				// and not the parent container width. So container queries are overridden with media queries
+				// within flexbox below.
+				container-type: normal;
+			}
+
 			.googlesitekit-rrm-settings-edit__product-id-warning-notice {
 				@media (min-width: $bp-wpAdminBarTablet) {
 					left: 220px;
 					max-width: 442px;
 					position: absolute;
 					top: -10px;
+
+					.googlesitekit-notice {
+						align-items: center;
+						flex-direction: row;
+						gap: $grid-gap-phone;
+						padding: 14px $grid-gap-desktop;
+
+						.googlesitekit-notice__content {
+							flex: 1;
+						}
+
+						.googlesitekit-notice__action {
+							justify-content: normal;
+							width: auto;
+						}
+					}
 				}
 			}
 		}
diff --git a/assets/sass/config/_variables.scss b/assets/sass/config/_variables.scss
index 9e166712a2f..036b1c5c178 100644
--- a/assets/sass/config/_variables.scss
+++ b/assets/sass/config/_variables.scss
@@ -273,6 +273,9 @@ $width-xxlarge: 1440;
 $width-xxxlarge: 1500;
 $page-content-max-width: 1366px;
 
+// Container widths (for container queries)
+$container-width-desktop: 800px;
+
 // Custom Media Breakpoints
 $bp-xsmallOnly: $width-xsmall - 1 + px;
 $bp-mobileOnly: $width-tablet - 1 + px;
diff --git a/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_0_small.png
index 357d5529efd..ccb57077930 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_1_medium.png
index 4d317a44fad..0471b6be280 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Components_Google_Tag_Gateway_GoogleTagGatewayToggle_Server_requirements_fail_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_Notice_All_Notices_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_Notice_All_Notices_0_document_0_small.png
index 8d95330c3cf..50e73ae7d9a 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_Notice_All_Notices_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_Notice_All_Notices_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_GA4AdSenseLinkedNotification_GA4AdSenseLinkedNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_GA4AdSenseLinkedNotification_GA4AdSenseLinkedNotification_0_document_0_small.png
index 88535d76687..33e6a881b34 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_GA4AdSenseLinkedNotification_GA4AdSenseLinkedNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_GA4AdSenseLinkedNotification_GA4AdSenseLinkedNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_ModuleSetupSuccessNotification_ModuleSetupSuccessNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_ModuleSetupSuccessNotification_ModuleSetupSuccessNotification_0_document_0_small.png
index d7fb9394709..a358b3ba987 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_ModuleSetupSuccessNotification_ModuleSetupSuccessNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_Notifications_Subtle_ModuleSetupSuccessNotification_ModuleSetupSuccessNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_OfflineNotification_Offline_Notification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_OfflineNotification_Offline_Notification_0_document_0_small.png
index f8e5c8490ac..a253a74a94d 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_OfflineNotification_Offline_Notification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_OfflineNotification_Offline_Notification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Components_ToastNotice_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Components_ToastNotice_Default_0_document_0_small.png
index 6ceffcba233..dcd59aba70f 100644
Binary files a/tests/backstop/reference/google-site-kit_Components_ToastNotice_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Components_ToastNotice_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_1_medium.png
index 71ed25e1358..9002dc14478 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_2_large.png
index e6bac792f9f..21cbf8bbf37 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_Default_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_1_medium.png
index 0382b5b8e2d..818df0991d1 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_2_large.png
index 76c96f9ddba..360aca6de2a 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithConsentAPINotActivated_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_1_medium.png
index 7bd43f71f44..7e61091d55a 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_2_large.png
index e7f79f2a2a3..d7f98fcc2f3 100644
Binary files a/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Consent_mode_SettingsCardConsentMode_WithoutConsentAPI_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_1_medium.png
index 383d47d6a80..5bdcf57c329 100644
Binary files a/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_2_large.png
index 595ac36214d..60b32d91a7a 100644
Binary files a/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Key_Metrics_ChipTabGroup_With_Error_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Key_Metrics_ConversionReportingNotificationCTAWidget_ConversionReportingNotificationCTAWidget_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Key_Metrics_ConversionReportingNotificationCTAWidget_ConversionReportingNotificationCTAWidget_0_document_0_small.png
index 6590f85a6ee..fb8e44c4d17 100644
Binary files a/tests/backstop/reference/google-site-kit_Key_Metrics_ConversionReportingNotificationCTAWidget_ConversionReportingNotificationCTAWidget_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Key_Metrics_ConversionReportingNotificationCTAWidget_ConversionReportingNotificationCTAWidget_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_AccountLinkedViaGoogleForWooCommerceSubtleNotification_AccountLinkedViaGoogleForWooCommerceSubtleNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_AccountLinkedViaGoogleForWooCommerceSubtleNotification_AccountLinkedViaGoogleForWooCommerceSubtleNotification_0_document_0_small.png
index 7fa9e6f7889..d66b4e94402 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_AccountLinkedViaGoogleForWooCommerceSubtleNotification_AccountLinkedViaGoogleForWooCommerceSubtleNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_AccountLinkedViaGoogleForWooCommerceSubtleNotification_AccountLinkedViaGoogleForWooCommerceSubtleNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_SetupSuccessSubtleNotification_SetupSuccessSubtleNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_SetupSuccessSubtleNotification_SetupSuccessSubtleNotification_0_document_0_small.png
index 7e012763bab..9d5c37a4c38 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_SetupSuccessSubtleNotification_SetupSuccessSubtleNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Ads_Notifications_SetupSuccessSubtleNotification_SetupSuccessSubtleNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_0_small.png
index e22fab469d3..ce10b291389 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_1_medium.png
index 6adac33b429..f82869572eb 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Ads_Settings_SettingsForm_GoogleTagGatewayDisabledWithWarning_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_0_small.png
index 0f79d5a6cf5..701488a72cf 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_1_medium.png
index 64c7ffa88c1..f2e3f75996d 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Default_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_0_small.png
index 3fb37b23816..da65c3894e5 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_1_medium.png
index 1d519dc5422..d4b79e94fa6 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_Insufficient_permissions_error_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_OAuth_error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_OAuth_error_0_document_1_medium.png
index 5281d17a1e6..1f100824aa4 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_OAuth_error_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationErrorNotice_OAuth_error_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationNotice_WithMissingScopeNotice_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationNotice_WithMissingScopeNotice_0_document_0_small.png
index 1e624c2ab42..7d4328d49ba 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationNotice_WithMissingScopeNotice_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceCreationNotice_WithMissingScopeNotice_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSegmentationSetupSuccessSubtleNotification_AudienceSegmentationSetupSuccessSubtleNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSegmentationSetupSuccessSubtleNotification_AudienceSegmentationSetupSuccessSubtleNotification_0_document_0_small.png
index c85703cef9d..0a801262a52 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSegmentationSetupSuccessSubtleNotification_AudienceSegmentationSetupSuccessSubtleNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSegmentationSetupSuccessSubtleNotification_AudienceSegmentationSetupSuccessSubtleNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_1_medium.png
index 2543b8f61b5..01c2ffd9ec4 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_2_large.png
index bbbcddf8c5b..798f9528c4f 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Components_AudienceSegmentation_Dashboard_AudienceSelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_EnhancedMeasurementActivationBanner_SuccessBanner_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_EnhancedMeasurementActivationBanner_SuccessBanner_Default_0_document_0_small.png
index dc1bc7756ca..ea9c1f922bf 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_EnhancedMeasurementActivationBanner_SuccessBanner_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_EnhancedMeasurementActivationBanner_SuccessBanner_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_0_small.png
index f0e630930b8..1fccd0080fb 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_1_medium.png
index cc4cc76b449..7e5a9da0f04 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Settings_SettingsEdit_With_Google_tag_gateway_unavailable_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Setup_SetupForm_Initial_setup_flow_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Setup_SetupForm_Initial_setup_flow_0_document_2_large.png
index b93d3742ae1..600ff0ecc0e 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Setup_SetupForm_Initial_setup_flow_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Setup_SetupForm_Initial_setup_flow_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_1_medium.png
index 2edb24d6276..3b829ba38ff 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_2_large.png
index 179e29db097..c4672626be7 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupBanner_ErrorOnCTAClick_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupSuccessSubtleNotification_GoogleTagGatewaySetupSuccessSubtleNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupSuccessSubtleNotification_GoogleTagGatewaySetupSuccessSubtleNotification_0_document_0_small.png
index 50620a6a72a..ed4c35e851c 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupSuccessSubtleNotification_GoogleTagGatewaySetupSuccessSubtleNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewaySetupSuccessSubtleNotification_GoogleTagGatewaySetupSuccessSubtleNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewayWarningNotification_GoogleTagGatewayWarningNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewayWarningNotification_GoogleTagGatewayWarningNotification_0_document_0_small.png
index 63c4b27751d..b37836501e4 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewayWarningNotification_GoogleTagGatewayWarningNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_GoogleTagGateway_Dashboard_GoogleTagGatewayWarningNotification_GoogleTagGatewayWarningNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_PageSpeed_Insights_Notifications_SetupSuccessNotification_SetupSuccessNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_PageSpeed_Insights_Notifications_SetupSuccessNotification_SetupSuccessNotification_0_document_0_small.png
index 0d5ca6f3b0b..d7a50bf4d41 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_PageSpeed_Insights_Notifications_SetupSuccessNotification_SetupSuccessNotification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_PageSpeed_Insights_Notifications_SetupSuccessNotification_SetupSuccessNotification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDContributionsNotification_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDContributionsNotification_Default_0_document_0_small.png
index 2e04d2c256c..dd888cf80b4 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDContributionsNotification_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDContributionsNotification_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDSubscriptionsNotification_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDSubscriptionsNotification_Default_0_document_0_small.png
index 8070c18bf8f..4b4c7ed64a5 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDSubscriptionsNotification_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_ProductIDSubscriptionsNotification_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Action_Required_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Action_Required_0_document_0_small.png
index e55d4997294..b4c5c4e03b0 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Action_Required_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Action_Required_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_No_Product_ID_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_No_Product_ID_0_document_0_small.png
index 97887058466..cbc1e72e52c 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_No_Product_ID_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_No_Product_ID_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_Product_ID_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_Product_ID_0_document_0_small.png
index 220c0bd3f4d..da87060edbf 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_Product_ID_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Contribution_and_Product_ID_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_No_Monetization_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_No_Monetization_0_document_0_small.png
index 3ddab9f9538..395e4ea6a3a 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_No_Monetization_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_No_Monetization_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_No_Product_ID_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_No_Product_ID_0_document_0_small.png
index cced610e22a..d9a6b8889d6 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_No_Product_ID_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_No_Product_ID_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_Product_ID_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_Product_ID_0_document_0_small.png
index 1f2b954a080..b4ec6968094 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_Product_ID_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Onboarding_Complete_-_With_Subscription_and_Product_ID_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Pending_Verification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Pending_Verification_0_document_0_small.png
index e70a7659f4e..bdb890ee8bc 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Pending_Verification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Components_Dashboard_RRMSetupSuccessSubtleNotification_Pending_Verification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_ActionRequired_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_ActionRequired_0_document_0_small.png
index b8e83b185a5..a7dbdbb2106 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_ActionRequired_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_ActionRequired_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_Default_0_document_0_small.png
index c7f8cdb9cc5..e3a85a2c992 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_MissingProductID_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_MissingProductID_0_document_0_small.png
index 364e6ac7bd6..33096fbf299 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_MissingProductID_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_MissingProductID_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_PendingVerification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_PendingVerification_0_document_0_small.png
index 627cc9b6b78..d483317c322 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_PendingVerification_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_PendingVerification_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithProductIDWarningNotice_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithProductIDWarningNotice_0_document_0_small.png
index d2e3316a723..c5e8c559732 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithProductIDWarningNotice_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithProductIDWarningNotice_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithoutModuleAccess_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithoutModuleAccess_0_document_0_small.png
index 7e1c3654e4a..984d52c3fce 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithoutModuleAccess_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsEdit_WithoutModuleAccess_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithActionRequiredNotice_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithActionRequiredNotice_0_document_0_small.png
index f70c265a25c..169d2fffd7b 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithActionRequiredNotice_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithActionRequiredNotice_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithPendingVerificationNotice_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithPendingVerificationNotice_0_document_0_small.png
index b3bec5822c0..7edc4bdca51 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithPendingVerificationNotice_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_ReaderRevenueManager_Settings_SettingsView_WithPendingVerificationNotice_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_0_small.png
index 98e51c236aa..2c4cdb6c8e0 100644
Binary files a/tests/backstop/reference/google-site-kit_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_Reset_success_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_Reset_success_0_document_0_small.png
index 936133e1eb3..3758bd86a05 100644
Binary files a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_Reset_success_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_Reset_success_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Reset_success_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Reset_success_0_document_0_small.png
index 59118dd7e26..0792a4a0b26 100644
Binary files a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Reset_success_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Reset_success_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit__Modules_AdSense_Settings_AdBlockingRecoverySetupCTANotice_Ready_0_document_0_small.png b/tests/backstop/reference/google-site-kit__Modules_AdSense_Settings_AdBlockingRecoverySetupCTANotice_Ready_0_document_0_small.png
index 3e33c8bfcea..25c303725c6 100644
Binary files a/tests/backstop/reference/google-site-kit__Modules_AdSense_Settings_AdBlockingRecoverySetupCTANotice_Ready_0_document_0_small.png and b/tests/backstop/reference/google-site-kit__Modules_AdSense_Settings_AdBlockingRecoverySetupCTANotice_Ready_0_document_0_small.png differ