Index: src/bp-messages/bp-messages-template.php
===================================================================
--- src/bp-messages/bp-messages-template.php	(revision 11573)
+++ src/bp-messages/bp-messages-template.php	(working copy)
@@ -1267,7 +1267,7 @@
 				<p>
 					<strong><?php echo stripslashes( wp_filter_kses( $notice->subject ) ) ?></strong><br />
 					<?php echo stripslashes( wp_filter_kses( $notice->message) ) ?>
-					<a href="#" id="close-notice"><?php _e( 'Close', 'buddypress' ) ?></a>
+					<button type="button" id="close-notice" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Dismiss this notice', 'buddypress' ) ?>"><span class="bp-screen-reader-text"><?php _e( 'Dismiss this notice', 'buddypress' ) ?>"></span> <span aria-hidden="true">&Chi;</span></button>
 					<?php wp_nonce_field( 'bp_messages_close_notice', 'close-notice-nonce' ); ?>
 				</p>
 			</div>
Index: src/bp-templates/bp-legacy/css/buddypress-rtl.css
===================================================================
--- src/bp-templates/bp-legacy/css/buddypress-rtl.css	(revision 11573)
+++ src/bp-templates/bp-legacy/css/buddypress-rtl.css	(working copy)
@@ -1216,13 +1216,30 @@
 }
 #buddypress div#message p,
 #sitewide-notice p {
+	background-color: #ffd;
+	border: 1px solid #cb2;
+	color: #440;
 	font-weight: normal;
 	margin-top: 3px;
 	text-decoration: none;
-	background-color: #ffd;
-	border: 1px solid #cb2;
-	color: #440;
 }
+.bp-site-wide-message #message p,
+.admin-bar-on #message p {
+	padding-left: 20px;
+	position: relative;
+}
+.bp-site-wide-message #message button,
+.admin-bar-on #message button {
+	font-size: 0.8em;
+	padding: 2px 4px;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.admin-bar-on #message button {
+	top:7px;
+	left: 10px;
+}
 #buddypress #item-header:after {
 	clear: both;
 	content: "";
@@ -1869,6 +1886,15 @@
 	z-index: 999;
 }
 
+.bp-site-wide-message .bp-tooltip:hover::after,
+.bp-site-wide-message .bp-tooltip:active::after,
+.bp-site-wide-message .bp-tooltip:focus::after,
+.admin-bar-on .bp-tooltip:hover::after,
+.admin-bar-on .bp-tooltip:active::after,
+.admin-bar-on .bp-tooltip:focus::after {
+	left: 50px;
+}
+
 /*--------------------------------------------------------------
 4.0 - Media Queries
 --------------------------------------------------------------*/
Index: src/bp-templates/bp-legacy/css/buddypress.css
===================================================================
--- src/bp-templates/bp-legacy/css/buddypress.css	(revision 11573)
+++ src/bp-templates/bp-legacy/css/buddypress.css	(working copy)
@@ -1216,13 +1216,30 @@
 }
 #buddypress div#message p,
 #sitewide-notice p {
+	background-color: #ffd;
+	border: 1px solid #cb2;
+	color: #440;
 	font-weight: normal;
 	margin-top: 3px;
 	text-decoration: none;
-	background-color: #ffd;
-	border: 1px solid #cb2;
-	color: #440;
 }
+.bp-site-wide-message #message p,
+.admin-bar-on #message p {
+	padding-right: 20px;
+	position: relative;
+}
+.bp-site-wide-message #message button,
+.admin-bar-on #message button {
+	font-size: 0.8em;
+	padding: 2px 4px;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.admin-bar-on #message button {
+	top:7px;
+	right: 10px;
+}
 #buddypress #item-header:after {
 	clear: both;
 	content: "";
@@ -1869,6 +1886,15 @@
 	z-index: 999;
 }
 
+.bp-site-wide-message .bp-tooltip:hover::after,
+.bp-site-wide-message .bp-tooltip:active::after,
+.bp-site-wide-message .bp-tooltip:focus::after,
+.admin-bar-on .bp-tooltip:hover::after,
+.admin-bar-on .bp-tooltip:active::after,
+.admin-bar-on .bp-tooltip:focus::after {
+	right: 50px;
+}
+
 /*--------------------------------------------------------------
 4.0 - Media Queries
 --------------------------------------------------------------*/