diff --git src/bp-templates/bp-nouveau/common-styles/_bp_info_messages.scss src/bp-templates/bp-nouveau/common-styles/_bp_info_messages.scss
index 42be01bf9..08fee28c0 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_info_messages.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_info_messages.scss
@@ -156,7 +156,8 @@
 	.bp-feedback.warning,
 	.bp-feedback.loading,
 	.bp-feedback.success,
-	.bp-feedback.updated {
+	.bp-feedback.updated,
+	.bp-feedback.bp-sitewide-notice {
 
 		.bp-icon {
 
diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index 9d02cef2d..ede72290c 100644
--- src/bp-templates/bp-nouveau/css/buddypress-rtl.css
+++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css
@@ -4584,7 +4584,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap .bp-feedback.warning .bp-icon,
 .buddypress-wrap .bp-feedback.loading .bp-icon,
 .buddypress-wrap .bp-feedback.success .bp-icon,
-.buddypress-wrap .bp-feedback.updated .bp-icon {
+.buddypress-wrap .bp-feedback.updated .bp-icon,
+.buddypress-wrap .bp-feedback.bp-sitewide-notice .bp-icon {
 	display: flex;
 	align-items: center;
 	align-self: stretch;
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index a090746fe..871b19f0c 100644
--- src/bp-templates/bp-nouveau/css/buddypress.css
+++ src/bp-templates/bp-nouveau/css/buddypress.css
@@ -4584,7 +4584,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap .bp-feedback.warning .bp-icon,
 .buddypress-wrap .bp-feedback.loading .bp-icon,
 .buddypress-wrap .bp-feedback.success .bp-icon,
-.buddypress-wrap .bp-feedback.updated .bp-icon {
+.buddypress-wrap .bp-feedback.updated .bp-icon,
+.buddypress-wrap .bp-feedback.bp-sitewide-notice .bp-icon {
 	display: flex;
 	align-items: center;
 	align-self: stretch;
diff --git src/bp-templates/bp-nouveau/css/twentytwentytwo-rtl.css src/bp-templates/bp-nouveau/css/twentytwentytwo-rtl.css
index db45bd7e8..83d60f8b8 100644
--- src/bp-templates/bp-nouveau/css/twentytwentytwo-rtl.css
+++ src/bp-templates/bp-nouveau/css/twentytwentytwo-rtl.css
@@ -1619,14 +1619,16 @@ button.pending,
 	border-bottom: solid 1px var(--wp--preset--color--primary);
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip {
 	border: none;
 	background: none;
 	top: -5px;
 	left: 0;
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip .dashicons-dismiss {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip .dashicons-dismiss,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip .dashicons-dismiss {
 	border-radius: 50%;
 	width: 32px;
 	height: 32px;
@@ -1634,14 +1636,16 @@ button.pending,
 	background: var(--wp--preset--color--background);
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip:hover .dashicons-dismiss {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip:hover .dashicons-dismiss,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip:hover .dashicons-dismiss {
 	color: var(--wp--preset--color--background);
 	background: var(--wp--preset--color--primary);
 }
 
-#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice button.bp-tooltip {
-	top: 0;
-	left: 15px;
+#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice button.bp-tooltip,
+#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice a.bp-tooltip {
+	top: 5px;
+	left: 5px;
 }
 
 #buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice .bp-icon:before {
diff --git src/bp-templates/bp-nouveau/css/twentytwentytwo.css src/bp-templates/bp-nouveau/css/twentytwentytwo.css
index ca543c0bb..6624cf4ca 100644
--- src/bp-templates/bp-nouveau/css/twentytwentytwo.css
+++ src/bp-templates/bp-nouveau/css/twentytwentytwo.css
@@ -1619,14 +1619,16 @@ button.pending,
 	border-bottom: solid 1px var(--wp--preset--color--primary);
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip {
 	border: none;
 	background: none;
 	top: -5px;
 	right: 0;
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip .dashicons-dismiss {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip .dashicons-dismiss,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip .dashicons-dismiss {
 	border-radius: 50%;
 	width: 32px;
 	height: 32px;
@@ -1634,14 +1636,16 @@ button.pending,
 	background: var(--wp--preset--color--background);
 }
 
-#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip:hover .dashicons-dismiss {
+#buddypress.twentytwentytwo .bp-feedback button.bp-tooltip:hover .dashicons-dismiss,
+#buddypress.twentytwentytwo .bp-feedback a.bp-tooltip:hover .dashicons-dismiss {
 	color: var(--wp--preset--color--background);
 	background: var(--wp--preset--color--primary);
 }
 
-#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice button.bp-tooltip {
-	top: 0;
-	right: 15px;
+#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice button.bp-tooltip,
+#buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice a.bp-tooltip {
+	top: 5px;
+	right: 5px;
 }
 
 #buddypress.twentytwentytwo .bp-feedback.bp-sitewide-notice .bp-icon:before {
diff --git src/bp-templates/bp-nouveau/sass/twentytwentytwo.scss src/bp-templates/bp-nouveau/sass/twentytwentytwo.scss
index 82a990421..412f81b04 100644
--- src/bp-templates/bp-nouveau/sass/twentytwentytwo.scss
+++ src/bp-templates/bp-nouveau/sass/twentytwentytwo.scss
@@ -2113,7 +2113,8 @@ body.bp-user.settings.general {
 			border-bottom: solid 1px var(--wp--preset--color--primary);
 		}
 
-		button.bp-tooltip {
+		button.bp-tooltip,
+		a.bp-tooltip {
 			border: none;
 			background: none;
 			top: -5px;
@@ -2138,9 +2139,10 @@ body.bp-user.settings.general {
 
 		&.bp-sitewide-notice {
 
-			button.bp-tooltip {
-				top: 0;
-				right: 15px;
+			button.bp-tooltip,
+			a.bp-tooltip {
+				top: 5px;
+				right: 5px;
 			}
 
 			.bp-icon:before {