diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 3553e7a4f6..cdf63fee9b 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -111,7 +111,7 @@ div.city_state_postcode #addressbook-edit_adr_one_postalcode {margin-right: 5px
     position: absolute;
     top: 0; /* Required for Chrome 76+ on Windows */
     left: 350px;
-    right: 233px;
+    right: 235px;
 }
 #addressbook-index .filtersContainer select {
 	width: 31.5%;
@@ -123,10 +123,12 @@ select#addressbook-index_col_filter\[tid\] {
 }
 #addressbook-index_addressbook-index-row select, #addressbook-index_addressbook-index-row et2-select {
 	float: right;
-	width: 134px;
+	width: 132px;
 	display: inline-block;
 	height: 20px;
-	margin-top: 1px;
+}
+et2-button#addressbook-index_nm_advanced-search {
+	margin-right: 0 !important;
 }
 #addressbook-edit .chzn-container .chzn-results {max-height: 110px}
 
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index d564748fb1..caa2181bd1 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -127,7 +127,7 @@ div.city_state_postcode #addressbook-edit_adr_one_postalcode {
   top: 0;
   /* Required for Chrome 76+ on Windows */
   left: 350px;
-  right: 233px;
+  right: 235px;
 }
 #addressbook-index .filtersContainer select {
   width: 31.5%;
@@ -143,10 +143,12 @@ select#addressbook-index_col_filter\[tid\] {
 #addressbook-index_addressbook-index-row select,
 #addressbook-index_addressbook-index-row et2-select {
   float: right;
-  width: 134px;
+  width: 132px;
   display: inline-block;
   height: 20px;
-  margin-top: 1px;
+}
+et2-button#addressbook-index_nm_advanced-search {
+  margin-right: 0 !important;
 }
 #addressbook-edit .chzn-container .chzn-results {
   max-height: 110px;
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 3400e4cffd..9c4af309bd 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2164,15 +2164,15 @@ div.message.floating, lion-validation-feedback[type] {
 
 .nextmatch_header_row {
     width: 100%;
+    padding-top: 1px;
     padding-bottom: 5px;
     position: relative;
 }
 
 .nextmatch_header .header_count {
     padding: 0px 10px;
-    margin: 1px 6px 1px;
     height: 22px;
-    border: 1px solid silver;
+    border: 1px solid rgb(212, 212, 216);   /* --sl-input-border-color */
     text-align: center;
     border-radius: 3px;
     float: right;
@@ -2866,10 +2866,8 @@ div.et2_toolbar.ui-widget-header {
     padding-left: 0;
     background-color: #fafafa;
 }
-.nextmatch_header_row et2-button, .et2_toolbar et2-button {
-    background-color: #fafafa;
-    margin: 1px 4px 0 0;
-    border-color: silver;
+.nextmatch_header_row et2-button, .nextmatch_header_row et2-searchbox, .et2_toolbar et2-button {
+    margin-right: 1ex;
 }
 .nextmatch_header_row et2-button::part(container){
     height: 18px;