diff --git a/_inc/client/components/admin-notices/index.jsx b/_inc/client/components/admin-notices/index.jsx
index de3deb56d6b8a..c5781b4e3ff39 100644
--- a/_inc/client/components/admin-notices/index.jsx
+++ b/_inc/client/components/admin-notices/index.jsx
@@ -11,11 +11,12 @@ const AdminNotices = React.createClass( {
 		if ( $vpNotice.length > 0 ) {
 			$vpNotice.each( function () {
 				let $notice = jQuery( this ).addClass( 'dops-notice is-warning' ).removeClass( 'wrap vp-notice' );
+				$notice.wrapInner( '<div class="dops-notice__content">' );
 				$notice.find( 'a' ).addClass( 'dops-notice__action' ).appendTo( $notice );
 				$notice.find( '.vp-message' ).removeClass( 'vp-message' ).addClass( 'dops-notice__text' );
 				$notice.find( 'h3' ).replaceWith( function () { return jQuery( '<strong />', { html: this.innerHTML } ); } );
 				$notice.find( 'p' ).replaceWith( function () { return jQuery( '<div/>', { html: this.innerHTML } ); } );
-				$notice.prependTo( $adminNotices ).wrapInner( '<div class="dops-notice__content">' ).show();
+				$notice.prependTo( $adminNotices ).show();
 			} );
 		}
 
diff --git a/_inc/client/components/jetpack-notices/index.jsx b/_inc/client/components/jetpack-notices/index.jsx
index 604cddaafd52b..5250f9a4f000c 100644
--- a/_inc/client/components/jetpack-notices/index.jsx
+++ b/_inc/client/components/jetpack-notices/index.jsx
@@ -120,7 +120,7 @@ export const DevModeNotice = React.createClass( {
 			return (
 				<SimpleNotice
 					showDismiss={ false }
-					status="is-basic"
+					status="is-info"
 					text={ text }
 				>
 					<NoticeAction