diff --git src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss
index b294474a1..8e4917b71 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss
@@ -1,5 +1,6 @@
 // BP Activity Entries - activity loop
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 .activity-list {
 
@@ -133,7 +134,9 @@
 			.avatar {
 				display: inline-block;
 				margin: 0 $marg-xsml;
-				vertical-align: bottom;
+				vertical-align: text-top;
+				width: 20px;
+				height: 20px;
 			}
 
 			.time-since {
@@ -215,6 +218,7 @@
 
 			.button {
 				background: transparent;
+				color: $dark-grey;
 			}
 
 			a {
@@ -326,7 +330,7 @@
 				padding: $pad-sml 0;
 
 				&:focus,
-				&:hover, {
+				&:hover {
 					background: $white;
 					color: $black;
 				}
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss
index a1ff806bb..740eca66b 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_buttons.scss
@@ -1,5 +1,6 @@
 // BP Buttons, Submits, Icons and general clicky things styling.
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 // Buttons by default are styled as simple boxes but we may
 // change that by adding a parent class ( on any close parent to
@@ -25,8 +26,10 @@
 			border-color: $bp-border-dark;
 			border-style: solid;
 			border-width: 1px;
+			border-radius: 0;
 			color: $dark-grey;
 			cursor: pointer;
+			font-family: inherit;
 			font-size: inherit;
 			font-weight: 400;
 			outline: none;
@@ -34,6 +37,7 @@
 			text-align: center;
 			text-decoration: none;
 			width: auto;
+			line-height: 1;
 		}
 
 		// Re-instate the quick-tag padding to avoid the above ruleset
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_forms.scss src/bp-templates/bp-nouveau/common-styles/_bp_forms.scss
index fa0f83c98..1f715f418 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_forms.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_forms.scss
@@ -1,5 +1,6 @@
 // BP Forms Elements Global Styles
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 // Some essential classes used for forms elements:
 // labels - sizing especially for standalone controls
@@ -353,7 +354,7 @@ body.no-js {
 			position: relative;
 			text-indent: -2px;
 			z-index: 1;
-			width: 100%;
+			width: auto;
 		}
 
 		select,
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
index 2154c7ae1..438f30ce0 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss
@@ -1,5 +1,6 @@
 // BP Generic elements, Typography and Images.
-// @version 4.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 // ========= Generic Sitewide elements ========
 body {
@@ -125,6 +126,11 @@ body.buddypress { // add weight
 			// some themes add padding top lets manage that generically sitewide
 			padding: 0;
 		}
+
+		// Specific to Twenty Nineteen
+		h2:before {
+			display: none;
+		}
 	}
 }
 
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_groups_create.scss src/bp-templates/bp-nouveau/common-styles/_bp_groups_create.scss
index 3b930aae2..59e76b75d 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_groups_create.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_groups_create.scss
@@ -8,6 +8,11 @@
 		text-align: center;
 	}
 
+	img.avatar {
+		width: auto;
+		height: auto;
+	}
+
 	.avatar-nav-items {
 		margin-top: $marg-med;
 	}
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_item_body_general.scss src/bp-templates/bp-nouveau/common-styles/_bp_item_body_general.scss
index fce4ca295..5509fcb52 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_item_body_general.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_item_body_general.scss
@@ -1,5 +1,6 @@
 // BP Single Screens Item Body General Styles.
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 .buddypress-wrap {
 
@@ -15,6 +16,7 @@
 
 		.button-tabs {
 			margin: $marg-xlrg 0 $marg-med;
+			list-style: none;
 		}
 
 	}
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_item_header_general.scss src/bp-templates/bp-nouveau/common-styles/_bp_item_header_general.scss
index 72720fc52..3f6b3d585 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_item_header_general.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_item_header_general.scss
@@ -1,5 +1,6 @@
 // BP Single Screens Item Header General Styles.
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 @include clearfix-element(".single-headers");
 
@@ -16,6 +17,8 @@
 
 			img {
 				float: none;
+				width: auto;
+				height: auto;
 			}
 		}
 	}
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_lists.scss src/bp-templates/bp-nouveau/common-styles/_bp_lists.scss
index 019c63636..fe8cefc6c 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_lists.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_lists.scss
@@ -1,5 +1,6 @@
 // BP Lists Global Styles.
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 // @todo decide whether using .buddypress quasi namespace parent
 // is useful, causing issue with specificity on other
@@ -42,7 +43,9 @@
 			text-align: center;
 
 			img.avatar {
-				display: inline;
+				display: inline-block;
+				width: auto;
+				height: auto;
 			}
 		}
 
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_search.scss src/bp-templates/bp-nouveau/common-styles/_bp_search.scss
index 706acbe58..bba309151 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_search.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_search.scss
@@ -1,5 +1,6 @@
 // BP Directory Search elements
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 .buddypress-wrap { // the ID is required to add weight to rules
 
@@ -7,15 +8,11 @@
 
 	form.bp-dir-search-form,
 	form.bp-messages-search-form,
-	form.bp-invites-search-form {
+	form[data-bp-search].bp-invites-search-form {
 		border: 1px solid $bp-border-color;
 
 		width: 100%;
 
-		@include medium-lrg-up() {
-			width: 15em;
-		}
-
 		label {
 			margin: 0;
 		}
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_update_form.scss src/bp-templates/bp-nouveau/common-styles/_bp_update_form.scss
index c0b058517..5ea7c8c19 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_update_form.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_update_form.scss
@@ -1,5 +1,6 @@
 // BP Whats new form handles user updates to groups or profiles
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 
 .activity-update-form {
 	padding: 10px 10px 0;
@@ -30,6 +31,8 @@
 		img {
 			box-shadow: none;
 			display: inline-block;
+			height: auto;
+			width: auto;
 		}
 	}
 
@@ -70,13 +73,20 @@
 		#whats-new-post-in-box-items {
 			list-style: none;
 			margin: $marg-sml 0;
+			padding-left: 0;
 
 			li {
 				margin-bottom: $marg-sml;
 			}
 
+			button.bp-remove-item {
+				margin-left: $marg-sml;
+				height: auto;
+			}
+
 			#activity-autocomplete {
 				padding: 0.3em;
+				width: 100%;
 			}
 
 			.bp-activity-object {
@@ -86,6 +96,7 @@
 
 				.avatar {
 					width: 30px;
+					height: 30px;
 				}
 
 				span {
@@ -133,8 +144,7 @@
 		#whats-new-content,
 		#whats-new-post-in-box,
 		#whats-new-submit {
-			margin-left: 8.5%;
-
+			margin-left: 55px;
 		}
 
 		#whats-new-submit {
diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index b716e4fec..9866b8093 100644
--- src/bp-templates/bp-nouveau/css/buddypress-rtl.css
+++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css
@@ -119,6 +119,10 @@ body.buddypress .buddypress-wrap h6 {
 	padding: 0;
 }
 
+body.buddypress .buddypress-wrap h2:before {
+	display: none;
+}
+
 /* Ensure .bp-wrap encloses it's children */
 .bp-wrap:before,
 .bp-wrap:after {
@@ -897,7 +901,9 @@ body.buddypress article.page > .entry-header .entry-title {
 }
 
 .bp-list li .item-avatar img.avatar {
-	display: inline;
+	display: inline-block;
+	width: auto;
+	height: auto;
 }
 
 .bp-list li .item .item-avatar,
@@ -1107,6 +1113,8 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-update-form #whats-new-avatar img {
 	box-shadow: none;
 	display: inline-block;
+	height: auto;
+	width: auto;
 }
 
 .activity-update-form #whats-new-content {
@@ -1136,14 +1144,21 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items {
 	list-style: none;
 	margin: 10px 0;
+	padding-right: 0;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items li {
 	margin-bottom: 10px;
 }
 
+.activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items button.bp-remove-item {
+	margin-right: 10px;
+	height: auto;
+}
+
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items #activity-autocomplete {
 	padding: 0.3em;
+	width: 100%;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object {
@@ -1154,6 +1169,7 @@ body.buddypress article.page > .entry-header .entry-title {
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object .avatar {
 	width: 30px;
+	height: 30px;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object span {
@@ -1193,7 +1209,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	.activity-update-form #whats-new-content,
 	.activity-update-form #whats-new-post-in-box,
 	.activity-update-form #whats-new-submit {
-		margin-right: 8.5%;
+		margin-right: 55px;
 	}
 	.activity-update-form #whats-new-submit input {
 		margin-bottom: 0;
@@ -1325,7 +1341,9 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-list .activity-item .activity-header .avatar {
 	display: inline-block;
 	margin: 0 5px;
-	vertical-align: bottom;
+	vertical-align: text-top;
+	width: 20px;
+	height: 20px;
 }
 
 .activity-list .activity-item .activity-header .time-since {
@@ -1391,6 +1409,7 @@ body.buddypress article.page > .entry-header .entry-title {
 
 .activity-list .activity-item .activity-meta.action .button {
 	background: transparent;
+	color: #555;
 }
 
 .activity-list .activity-item .activity-meta.action a {
@@ -1997,6 +2016,11 @@ form.ac-form .ac-reply-content input {
 	text-align: center;
 }
 
+#group-create-body img.avatar {
+	width: auto;
+	height: auto;
+}
+
 #group-create-body .avatar-nav-items {
 	margin-top: 15px;
 }
@@ -2032,6 +2056,8 @@ form.ac-form .ac-reply-content input {
 
 .single-headers #item-header-avatar a img {
 	float: none;
+	width: auto;
+	height: auto;
 }
 
 .single-headers div#item-header-content {
@@ -2333,6 +2359,7 @@ body.no-js .single-item-header .js-self-profile-button {
 
 .buddypress-wrap .item-body .button-tabs {
 	margin: 30px 0 15px;
+	list-style: none;
 }
 
 .buddypress-wrap.bp-single-vert-nav .bp-list:not(.grid) .item-entry {
@@ -3015,6 +3042,7 @@ body.register .buddypress-wrap .page ul {
 .bp-messages-content .actions {
 	float: left;
 	max-width: 30%;
+	line-height: 1;
 }
 
 .bp-messages-content .actions .bp-icons:not(.bp-hide) {
@@ -3168,6 +3196,7 @@ body.register .buddypress-wrap .page ul {
 
 .bp-messages-content .thread-participants img {
 	width: 30px;
+	height: 30px;
 }
 
 .bp-messages-content #thread-preview .preview-message ul,
@@ -3508,7 +3537,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	position: relative;
 	text-indent: -2px;
 	z-index: 1;
-	width: 100%;
+	width: auto;
 }
 
 .buddypress-wrap .select-wrap select,
@@ -3564,22 +3593,14 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form,
 .buddypress-wrap form.bp-messages-search-form,
-.buddypress-wrap form.bp-invites-search-form {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form {
 	border: 1px solid #eee;
 	width: 100%;
 }
 
-@media screen and (min-width: 55em) {
-	.buddypress-wrap form.bp-dir-search-form,
-	.buddypress-wrap form.bp-messages-search-form,
-	.buddypress-wrap form.bp-invites-search-form {
-		width: 15em;
-	}
-}
-
 .buddypress-wrap form.bp-dir-search-form label,
 .buddypress-wrap form.bp-messages-search-form label,
-.buddypress-wrap form.bp-invites-search-form label {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form label {
 	margin: 0;
 }
 
@@ -3589,9 +3610,9 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-messages-search-form input[type="search"],
 .buddypress-wrap form.bp-messages-search-form input[type="text"],
 .buddypress-wrap form.bp-messages-search-form button[type="submit"],
-.buddypress-wrap form.bp-invites-search-form input[type="search"],
-.buddypress-wrap form.bp-invites-search-form input[type="text"],
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="text"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] {
 	background: none;
 	border: 0;
 	border-radius: 0;
@@ -3602,8 +3623,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-dir-search-form input[type="text"],
 .buddypress-wrap form.bp-messages-search-form input[type="search"],
 .buddypress-wrap form.bp-messages-search-form input[type="text"],
-.buddypress-wrap form.bp-invites-search-form input[type="search"],
-.buddypress-wrap form.bp-invites-search-form input[type="text"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="text"] {
 	float: right;
 	line-height: 1.5;
 	padding: 3px 10px;
@@ -3612,7 +3633,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"],
 .buddypress-wrap form.bp-messages-search-form button[type="submit"],
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] {
 	float: left;
 	font-size: inherit;
 	font-weight: 400;
@@ -3625,7 +3646,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"] span,
 .buddypress-wrap form.bp-messages-search-form button[type="submit"] span,
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] span {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] span {
 	font-family: dashicons;
 	font-size: 18px;
 	line-height: 1.6;
@@ -3633,7 +3654,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"].bp-show,
 .buddypress-wrap form.bp-messages-search-form button[type="submit"].bp-show,
-.buddypress-wrap form.bp-invites-search-form button[type="submit"].bp-show {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"].bp-show {
 	height: auto;
 	right: 0;
 	overflow: visible;
@@ -3643,7 +3664,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form input[type="search"]::-webkit-search-cancel-button,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-cancel-button,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-cancel-button {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-cancel-button {
 	-webkit-appearance: searchfield-cancel-button;
 }
 
@@ -3651,8 +3672,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-dir-search-form input[type="search"]::-webkit-search-results-decoration,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-results-button,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-results-decoration,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-results-button,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-results-decoration {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-results-button,
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-results-decoration {
 	display: none;
 }
 
@@ -3887,8 +3908,10 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	border-color: #ccc;
 	border-style: solid;
 	border-width: 1px;
+	border-radius: 0;
 	color: #555;
 	cursor: pointer;
+	font-family: inherit;
 	font-size: inherit;
 	font-weight: 400;
 	outline: none;
@@ -3896,6 +3919,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	text-align: center;
 	text-decoration: none;
 	width: auto;
+	line-height: 1;
 }
 
 .buddypress .buddypress-wrap .button-small[type="button"] {
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index 72848855d..723ec8ede 100644
--- src/bp-templates/bp-nouveau/css/buddypress.css
+++ src/bp-templates/bp-nouveau/css/buddypress.css
@@ -119,6 +119,10 @@ body.buddypress .buddypress-wrap h6 {
 	padding: 0;
 }
 
+body.buddypress .buddypress-wrap h2:before {
+	display: none;
+}
+
 /* Ensure .bp-wrap encloses it's children */
 .bp-wrap:before,
 .bp-wrap:after {
@@ -897,7 +901,9 @@ body.buddypress article.page > .entry-header .entry-title {
 }
 
 .bp-list li .item-avatar img.avatar {
-	display: inline;
+	display: inline-block;
+	width: auto;
+	height: auto;
 }
 
 .bp-list li .item .item-avatar,
@@ -1107,6 +1113,8 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-update-form #whats-new-avatar img {
 	box-shadow: none;
 	display: inline-block;
+	height: auto;
+	width: auto;
 }
 
 .activity-update-form #whats-new-content {
@@ -1136,14 +1144,21 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items {
 	list-style: none;
 	margin: 10px 0;
+	padding-left: 0;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items li {
 	margin-bottom: 10px;
 }
 
+.activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items button.bp-remove-item {
+	margin-left: 10px;
+	height: auto;
+}
+
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items #activity-autocomplete {
 	padding: 0.3em;
+	width: 100%;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object {
@@ -1154,6 +1169,7 @@ body.buddypress article.page > .entry-header .entry-title {
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object .avatar {
 	width: 30px;
+	height: 30px;
 }
 
 .activity-update-form #whats-new-post-in-box #whats-new-post-in-box-items .bp-activity-object span {
@@ -1193,7 +1209,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	.activity-update-form #whats-new-content,
 	.activity-update-form #whats-new-post-in-box,
 	.activity-update-form #whats-new-submit {
-		margin-left: 8.5%;
+		margin-left: 55px;
 	}
 	.activity-update-form #whats-new-submit input {
 		margin-bottom: 0;
@@ -1325,7 +1341,9 @@ body.buddypress article.page > .entry-header .entry-title {
 .activity-list .activity-item .activity-header .avatar {
 	display: inline-block;
 	margin: 0 5px;
-	vertical-align: bottom;
+	vertical-align: text-top;
+	width: 20px;
+	height: 20px;
 }
 
 .activity-list .activity-item .activity-header .time-since {
@@ -1391,6 +1409,7 @@ body.buddypress article.page > .entry-header .entry-title {
 
 .activity-list .activity-item .activity-meta.action .button {
 	background: transparent;
+	color: #555;
 }
 
 .activity-list .activity-item .activity-meta.action a {
@@ -1997,6 +2016,11 @@ form.ac-form .ac-reply-content input {
 	text-align: center;
 }
 
+#group-create-body img.avatar {
+	width: auto;
+	height: auto;
+}
+
 #group-create-body .avatar-nav-items {
 	margin-top: 15px;
 }
@@ -2032,6 +2056,8 @@ form.ac-form .ac-reply-content input {
 
 .single-headers #item-header-avatar a img {
 	float: none;
+	width: auto;
+	height: auto;
 }
 
 .single-headers div#item-header-content {
@@ -2333,6 +2359,7 @@ body.no-js .single-item-header .js-self-profile-button {
 
 .buddypress-wrap .item-body .button-tabs {
 	margin: 30px 0 15px;
+	list-style: none;
 }
 
 .buddypress-wrap.bp-single-vert-nav .bp-list:not(.grid) .item-entry {
@@ -3015,6 +3042,7 @@ body.register .buddypress-wrap .page ul {
 .bp-messages-content .actions {
 	float: right;
 	max-width: 30%;
+	line-height: 1;
 }
 
 .bp-messages-content .actions .bp-icons:not(.bp-hide) {
@@ -3168,6 +3196,7 @@ body.register .buddypress-wrap .page ul {
 
 .bp-messages-content .thread-participants img {
 	width: 30px;
+	height: 30px;
 }
 
 .bp-messages-content #thread-preview .preview-message ul,
@@ -3508,7 +3537,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	position: relative;
 	text-indent: -2px;
 	z-index: 1;
-	width: 100%;
+	width: auto;
 }
 
 .buddypress-wrap .select-wrap select,
@@ -3564,22 +3593,14 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form,
 .buddypress-wrap form.bp-messages-search-form,
-.buddypress-wrap form.bp-invites-search-form {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form {
 	border: 1px solid #eee;
 	width: 100%;
 }
 
-@media screen and (min-width: 55em) {
-	.buddypress-wrap form.bp-dir-search-form,
-	.buddypress-wrap form.bp-messages-search-form,
-	.buddypress-wrap form.bp-invites-search-form {
-		width: 15em;
-	}
-}
-
 .buddypress-wrap form.bp-dir-search-form label,
 .buddypress-wrap form.bp-messages-search-form label,
-.buddypress-wrap form.bp-invites-search-form label {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form label {
 	margin: 0;
 }
 
@@ -3589,9 +3610,9 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-messages-search-form input[type="search"],
 .buddypress-wrap form.bp-messages-search-form input[type="text"],
 .buddypress-wrap form.bp-messages-search-form button[type="submit"],
-.buddypress-wrap form.bp-invites-search-form input[type="search"],
-.buddypress-wrap form.bp-invites-search-form input[type="text"],
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="text"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] {
 	background: none;
 	border: 0;
 	border-radius: 0;
@@ -3602,8 +3623,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-dir-search-form input[type="text"],
 .buddypress-wrap form.bp-messages-search-form input[type="search"],
 .buddypress-wrap form.bp-messages-search-form input[type="text"],
-.buddypress-wrap form.bp-invites-search-form input[type="search"],
-.buddypress-wrap form.bp-invites-search-form input[type="text"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"],
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="text"] {
 	float: left;
 	line-height: 1.5;
 	padding: 3px 10px;
@@ -3612,7 +3633,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"],
 .buddypress-wrap form.bp-messages-search-form button[type="submit"],
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] {
 	float: right;
 	font-size: inherit;
 	font-weight: 400;
@@ -3625,7 +3646,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"] span,
 .buddypress-wrap form.bp-messages-search-form button[type="submit"] span,
-.buddypress-wrap form.bp-invites-search-form button[type="submit"] span {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"] span {
 	font-family: dashicons;
 	font-size: 18px;
 	line-height: 1.6;
@@ -3633,7 +3654,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form button[type="submit"].bp-show,
 .buddypress-wrap form.bp-messages-search-form button[type="submit"].bp-show,
-.buddypress-wrap form.bp-invites-search-form button[type="submit"].bp-show {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form button[type="submit"].bp-show {
 	height: auto;
 	left: 0;
 	overflow: visible;
@@ -3643,7 +3664,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 
 .buddypress-wrap form.bp-dir-search-form input[type="search"]::-webkit-search-cancel-button,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-cancel-button,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-cancel-button {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-cancel-button {
 	-webkit-appearance: searchfield-cancel-button;
 }
 
@@ -3651,8 +3672,8 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 .buddypress-wrap form.bp-dir-search-form input[type="search"]::-webkit-search-results-decoration,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-results-button,
 .buddypress-wrap form.bp-messages-search-form input[type="search"]::-webkit-search-results-decoration,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-results-button,
-.buddypress-wrap form.bp-invites-search-form input[type="search"]::-webkit-search-results-decoration {
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-results-button,
+.buddypress-wrap form[data-bp-search].bp-invites-search-form input[type="search"]::-webkit-search-results-decoration {
 	display: none;
 }
 
@@ -3887,8 +3908,10 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	border-color: #ccc;
 	border-style: solid;
 	border-width: 1px;
+	border-radius: 0;
 	color: #555;
 	cursor: pointer;
+	font-family: inherit;
 	font-size: inherit;
 	font-weight: 400;
 	outline: none;
@@ -3896,6 +3919,7 @@ body.no-js .buddypress #messages-bulk-management #select-all-messages {
 	text-align: center;
 	text-decoration: none;
 	width: auto;
+	line-height: 1;
 }
 
 .buddypress .buddypress-wrap .button-small[type="button"] {
diff --git src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
index 6544227c6..a04c262ce 100644
--- src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
+++ src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss
@@ -1,5 +1,6 @@
 // Nouveau Messages styles.
-// @version 3.0.0
+// @since 3.0.0
+// @version 5.0.0
 // Icon additions to default action star
 
 
@@ -187,6 +188,7 @@
 	.actions {
 		float: right;
 		max-width: 30%;
+		line-height: 1;
 
 		.bp-icons:not(.bp-hide) {
 			display: inline-block;
@@ -354,6 +356,7 @@
 
 		img {
 			width: 30px;
+			height: 30px;
 		}
 	}
 
