diff --git a/app/soapbox/actions/search.js b/app/soapbox/actions/search.js
index ee7bc16579..c974819fc9 100644
Binary files a/app/soapbox/actions/search.js and b/app/soapbox/actions/search.js differ
diff --git a/app/soapbox/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js
index c7838f96ab..5e8b31b8bd 100644
Binary files a/app/soapbox/features/compose/components/search_results.js and b/app/soapbox/features/compose/components/search_results.js differ
diff --git a/app/soapbox/features/compose/containers/search_results_container.js b/app/soapbox/features/compose/containers/search_results_container.js
index 046e374ac2..734612dcee 100644
Binary files a/app/soapbox/features/compose/containers/search_results_container.js and b/app/soapbox/features/compose/containers/search_results_container.js differ
diff --git a/app/soapbox/features/search/components/filter_bar.js b/app/soapbox/features/search/components/filter_bar.js
new file mode 100644
index 0000000000..917ad99c7a
Binary files /dev/null and b/app/soapbox/features/search/components/filter_bar.js differ
diff --git a/app/soapbox/features/search/index.js b/app/soapbox/features/search/index.js
index 63ea292a37..22a898d783 100644
Binary files a/app/soapbox/features/search/index.js and b/app/soapbox/features/search/index.js differ
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index c673963303..8601598641 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -636,6 +636,7 @@
   "search_results.statuses": "Wpisy",
   "search_results.top": "Góra",
   "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
+  "search_results.total.has_more": "{count, number} Ponad {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
   "security.codes.fail": "Nie udało się uzyskać zapasowych kodów",
   "security.confirm.fail": "Nieprawidłowy kod lub hasło. Spróbuj ponownie.",
   "security.delete_account.fail": "Nie udało się usunąć konta.",
diff --git a/app/soapbox/reducers/search.js b/app/soapbox/reducers/search.js
index 4a0a729a1e..c9ad6bfa8a 100644
Binary files a/app/soapbox/reducers/search.js and b/app/soapbox/reducers/search.js differ
diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js
index a409f5905c..343a3f9d90 100644
Binary files a/app/soapbox/reducers/settings.js and b/app/soapbox/reducers/settings.js differ
diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss
index 6933c60067..84d611fd8e 100644
--- a/app/styles/components/search.scss
+++ b/app/styles/components/search.scss
@@ -1,9 +1,19 @@
+.search-page {
+  min-height: 97px;
+}
+
 @media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
   .search-page .search {
     display: none;
   }
 }
 
+@media screen and (max-width: 600px + (285px * 1) + (10px * 1) - 1px) {
+  .search-page .column-header__wrapper {
+    display: none;
+  }
+}
+
 .search {
   position: relative;
 }
@@ -68,8 +78,6 @@
 }
 
 .search-results__section {
-  margin-bottom: 5px;
-
   h5 {
     background: var(--accent-color--faint);
     border-bottom: 1px solid var(--brand-color--faint);
@@ -86,8 +94,8 @@
     }
   }
 
-  .account:last-child,
-  & > div:last-child .status {
+  &:not(.has-more) .account:last-child,
+  &:not(.has-more) > div:last-child .status {
     border-bottom: 0;
   }
 }
@@ -160,3 +168,7 @@
 .search-popout {
   @include search-popout;
 }
+
+.search__filter-bar:last-child {
+  border-bottom: none;
+}
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index 5a6b3e5543..86cf3361da 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -608,6 +608,7 @@
 }
 
 .notification__filter-bar,
+.search__filter-bar,
 .account__section-headline {
   border-bottom: 1px solid var(--brand-color--faint);
   cursor: default;