diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index ab7d2972..dd06eb7e 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -60,8 +60,7 @@
 
 .SearchBar {
   display: inline-flex;
-  align-items: baseline;
-  vertical-align: baseline;
+  align-items: center;
   justify-content: flex-end;
 
   &.-expanded {
@@ -76,6 +75,14 @@
   .search-bar-input {
     flex: 1 0 auto;
     margin-left: 0.5em;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+
+  .search-button {
+    aspect-ratio: 1/1;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
   }
 
   .cancel-search {
@@ -87,5 +94,4 @@
     color: var(--btnTopBarText, $fallback--text);
   }
 }
-
 </style>
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 98cf0a17..6eb6322d 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -142,6 +142,7 @@
 
     .nowrap {
       display: flex;
+      align-items: end;
       white-space: nowrap;
     }
   }